remove generated file "config.h":

pass preprocessor definitions as command line arguments instead
this also drops the dependency on "autoheader"

diff --git a/acinclude.m4 b/acinclude.m4
index 385008dadabb27eeaf93061a4232d84a9b8bb272..e58d27518bf679bda0caa8acaa2a4662ffb2aac1 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,5 +1,4 @@
 AC_DEFUN(TUXBOX_APPS,[
-AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
 INSTALL="$INSTALL -p"

diff --git a/autogen.sh b/autogen.sh
index d646011e9c3eb82957c8ef1d61c7a8691eadb52c..7ce66e1a751300db36e73cf6b562fad424659910 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -55,8 +55,6 @@ echo "  libtoolize --automake"
 libtoolize --automake
 echo "  autoconf"
 autoconf
-echo "  autoheader"
-autoheader
 echo "  automake --add-missing"
 automake --add-missing 
 

diff --git a/configure.ac b/configure.ac
index 0fe3c481a6917ca608342642a281a1f42e4f5f33..a985afd08eb746592707ec685a164889cad2fbcc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,7 @@ if test "$withsdl" = "yes" ; then
        AC_DEFINE_UNQUOTED([WITH_SDL],[$withsdl],[With SDL])
 fi
 
+CPPFLAGS="$CPPFLAGS "'-I$(top_srcdir)'
 CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS $MD5SUM_CFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SDL_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS $DVBSI_CFLAGS"
 CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall"
 LDFLAGS="$LDFLAGS $PYTHON_LDFLAGS $SDL_LDFLAGS"

diff --git a/lib/base/eerror.h b/lib/base/eerror.h
index 2ae89e2f47d312b532625758e4c5082581e08582..ea5fcc51380252b1950cfeacb1e963576b155ebc 100644 (file)
--- a/lib/base/eerror.h
+++ b/lib/base/eerror.h
@@ -1,7 +1,6 @@
 #ifndef __E_ERROR__
 #define __E_ERROR__
 
-#include "config.h"
 #include <string>
 #include <map>       
 #include <new>

diff --git a/lib/base/encoding.cpp b/lib/base/encoding.cpp
index 48be7873c3fbab7dc7c70884f20dc9e421e1b823..2b834b6cda2a1448e998791b9acb3b540c14068e 100644 (file)
--- a/lib/base/encoding.cpp
+++ b/lib/base/encoding.cpp
@@ -1,6 +1,5 @@
 #include <lib/base/encoding.h>
 #include <lib/base/eerror.h>
-#include <config.h>
 
 eDVBTextEncodingHandler encodingHandler;  // the one and only instance
 

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index b99896fc978a8edc0a9310037cd14711a0501536..ce33d04f9b4692b483c1c3ee3cc8e2f6cca875ba 100644 (file)
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <lib/base/filepush.h>
 #include <lib/base/eerror.h>
 #include <errno.h>

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index cbc40683fcbd0fa8253b8f151dc2284515bb023c..8e21dcad49887926bd41b961cddb5b1881f43b4d 100644 (file)
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <lib/base/eerror.h>
 #include <lib/dvb/decoder.h>
 #if HAVE_DVB_API_VERSION < 3 

diff --git a/lib/dvb/demux.cpp b/lib/dvb/demux.cpp
index 384a77e15872e4e280be0062ad60593760d1d8eb..5be44dc92be46ff3e488c68b887dbe8b367dbd86 100644 (file)
--- a/lib/dvb/demux.cpp
+++ b/lib/dvb/demux.cpp
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 99cafe75340c73b63396ebdfdeba03a7622b36d4..c44a312a03b6ac14d6a5bd2ca823ddc5ae5abf27 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <lib/dvb/dvb.h>
 #include <lib/base/eerror.h>
 #include <errno.h>

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 0a7943f997b47e5da30ab06de55b879da27c2a2f..8843f6f4caf46e13713bb99a02b8b7e57447f416 100644 (file)
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -1,7 +1,6 @@
 #ifndef __dvb_frontend_h
 #define __dvb_frontend_h
 
-#include <config.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/sec.h>
 

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 5b6f19fc806b0ea126d655c13e82ec91d473271c..f18d4f34b81af4e660bd4e9191380ef6f9b9dfa1 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -1,7 +1,6 @@
 #ifndef __dvb_idvb_h
 #define __dvb_idvb_h
 
-#include <config.h>
 #if HAVE_DVB_API_VERSION < 3
 #include <ost/frontend.h>
 #define FRONTENDPARAMETERS FrontendParameters

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 5d74753a477be7d367e10ba9c6cfb1616c806647..58a1b6fa657e0d751298fd39db701127d19eb8b8 100644 (file)
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/sec.h>
 #include <lib/dvb/rotor_calc.h>

diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 8a51f3318f406920a187d9f3960f30c76fd00876..18bc2b37d67e75c63012b35ea6065abd5f9a7116 100644 (file)
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -1,7 +1,6 @@
 #ifndef __dvb_sec_h
 #define __dvb_sec_h
 
-#include <config.h>
 #include <lib/dvb/idvb.h>
 #include <list>
 

diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index 20eb3ce62c076815c703ec1f6c41bb4329c8a036..02a0b8a9905fa329d4578e5b85aa90da5f9c7a42 100644 (file)
--- a/lib/dvb/tstools.cpp
+++ b/lib/dvb/tstools.cpp
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <lib/dvb/tstools.h>
 #include <lib/base/eerror.h>
 #include <unistd.h>

diff --git a/lib/dvb/tstools.h b/lib/dvb/tstools.h
index 509946de6edcdfb2ffc942dda5a790bd3a2328c9..95fbd9e2ef3e38cdb1e6ed0b394f92fa89d4b394 100644 (file)
--- a/lib/dvb/tstools.h
+++ b/lib/dvb/tstools.h
@@ -1,7 +1,6 @@
 #ifndef __lib_dvb_tstools_h
 #define __lib_dvb_tstools_h
 
-#include <config.h>
 #include <sys/types.h>
 
 /*

diff --git a/lib/dvb/volume.cpp b/lib/dvb/volume.cpp
index e57fbc80ad6bcd677b2002d5a780cb9937d39d1a..9cfcf2ee65221bd70c6cd855c529bdfc4e38e2cb 100644 (file)
--- a/lib/dvb/volume.cpp
+++ b/lib/dvb/volume.cpp
@@ -4,7 +4,6 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include <config.h>
 #if HAVE_DVB_API_VERSION < 3
 #define VIDEO_DEV "/dev/dvb/card0/video0"
 #define AUDIO_DEV "/dev/dvb/card0/audio0"