From 4a98f3378224a2be1fb87ccb1ec45f503d1decc7 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Thu, 15 Jun 2006 09:29:21 +0200
Subject: [PATCH] Added "-fPIC" to the compiler options in Make.config.template
 when compiling plugins

---
 CONTRIBUTORS         | 2 ++
 HISTORY              | 6 ++++++
 Make.config.template | 7 ++++++-
 config.h             | 4 ++--
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 8bbb5f22..67595dd2 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1440,6 +1440,8 @@ Udo Richter <udo_richter@gmx.de>
  for fixing handling the "Power" key in case a timer is about to start recording
  for fixing calculating the start time of repeated timers with "first day"
  for setting a timer's cached start time to 0 after a call to Skip()
+ for adding "-fPIC" to the compiler options in Make.config.template when compiling
+ plugins
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
diff --git a/HISTORY b/HISTORY
index 856803b3..5b37632b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4782,3 +4782,9 @@ Video Disk Recorder Revision History
 - Changed the log messages when grabbing an image from 'isyslog()' to 'dsyslog()'
   so that they can be suppressed in normal operation mode to avoid clogging the
   log file in case this function is used frequently (suggested by Helmut Auer).
+
+2006-06-15: Version 1.4.1-1
+
+- Added "-fPIC" to the compiler options in Make.config.template when compiling
+  plugins (thanks to Udo Richter). If you use your own Make.config file, you may
+  want to add these lines there, too.
diff --git a/Make.config.template b/Make.config.template
index 4a22f655..b7effdfa 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.9 2006/05/26 10:41:46 kls Exp $
+# $Id: Make.config.template 1.10 2006/06/15 09:15:25 kls Exp $
 
 ### The C compiler and options:
 
@@ -16,6 +16,11 @@ CFLAGS   = -g -O2 -Wall
 CXX      = g++
 CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
 
+ifdef PLUGIN
+CFLAGS   += -fPIC
+CXXFLAGS += -fPIC
+endif
+
 ### The directory environment:
 
 #DVBDIR   = /usr/src/v4l-dvb/linux
diff --git a/config.h b/config.h
index 9ee94713..212c88d2 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.260 2006/06/11 08:57:35 kls Exp $
+ * $Id: config.h 1.261 2006/06/15 09:23:21 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -21,7 +21,7 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.4.1"
+#define VDRVERSION  "1.4.1-1"
 #define VDRVERSNUM   10401  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number: