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 385008d..e58d275 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 d646011..7ce66e1 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 0fe3c48..a985afd 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 2ae89e2..ea5fcc5 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 48be787..2b834b6 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 b99896f..ce33d04 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 cbc4068..8e21dca 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 384a77e..5be44dc 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 99cafe7..c44a312 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 0a7943f..8843f6f 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 5b6f19f..f18d4f3 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 5d74753..58a1b6f 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 8a51f33..18bc2b3 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 20eb3ce..02a0b8a 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 509946d..95fbd9e 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 e57fbc8..9cfcf2e 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"