diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2005-01-25 22:17:23 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2005-01-25 22:17:23 +0000 |
| commit | fef70b939aea15a2438f480d7bdd679e181dcb06 (patch) | |
| tree | e7877b751fc6554d49e852242c8b1be29aa90af3 | |
| parent | 5c517e1d40eac9531b1efffee24c70d297867112 (diff) | |
| download | enigma2-fef70b939aea15a2438f480d7bdd679e181dcb06.tar.gz enigma2-fef70b939aea15a2438f480d7bdd679e181dcb06.zip | |
remove xmltree
| -rw-r--r-- | acinclude.m4 | 39 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | main/Makefile.am | 1 |
3 files changed, 27 insertions, 15 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 63b14444..074e1a03 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -142,29 +142,42 @@ AC_SUBST(DRIVER) AC_DEFUN([TUXBOX_APPS_DVB],[ AC_ARG_WITH(dvbincludes, - [ --with-dvbincludes=PATH path for dvb includes[[NONE]]], + [ --with-dvbincludes=PATH path for dvb includes [[NONE]]], [DVBINCLUDES="$withval"],[DVBINCLUDES=""]) -orig_CPPFLAGS=$CPPFLAGS if test "$DVBINCLUDES"; then - CPPFLAGS="-I$DVBINCLUDES" -else - CPPFLAGS="" + CPPFLAGS="$CPPFLAGS -I$DVBINCLUDES" fi -AC_CHECK_HEADERS(linux/dvb/version.h,[DVB_VERSION_H="yes"]) -AC_CHECK_HEADERS(ost/dmx.h,[OST_DMX_H="yes"]) -if test "$DVB_VERSION_H"; then - AC_MSG_NOTICE([found dvb version 2 or later]) -elif test "$OST_DMX_H"; then + +AC_CHECK_HEADERS(ost/dmx.h,[ + DVB_API_VERSION=1 AC_MSG_NOTICE([found dvb version 1]) +]) + +if test -z "$DVB_API_VERSION"; then +AC_CHECK_HEADERS(linux/dvb/version.h,[ + AC_LANG_PREPROC_REQUIRE() + AC_REQUIRE([AC_PROG_EGREP]) + AC_LANG_CONFTEST([AC_LANG_SOURCE([[ +#include <linux/dvb/version.h> +version DVB_API_VERSION + ]])]) + DVB_API_VERSION=`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | $EGREP "^version" | sed "s,version\ ,,"` + rm -f conftest* + + AC_MSG_NOTICE([found dvb version $DVB_API_VERSION]) +]) +fi + +if test "$DVB_API_VERSION"; then + AC_DEFINE(HAVE_DVB,1,[Define to 1 if you have the dvb includes]) + AC_DEFINE_UNQUOTED(HAVE_DVB_API_VERSION,$DVB_API_VERSION,[Define to the version of the dvb api]) else AC_MSG_ERROR([can't find dvb headers]) fi -DVB_VERSION_H= -OST_DMX_H= -CPPFLAGS="$orig_CPPFLAGS -I$DVBINCLUDES" ]) + AC_DEFUN(_TUXBOX_APPS_LIB_CONFIG,[ AC_PATH_PROG($1_CONFIG,$2,no) if test "$$1_CONFIG" != "no"; then diff --git a/configure.ac b/configure.ac index f1061ae5..5f118f8c 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad) #TUXBOX_APPS_LIB_PKGCONFIG(PLUGINS,tuxbox-plugins) TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng) TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-1.2) -TUXBOX_APPS_LIB_PKGCONFIG(XMLTREE,tuxbox-xmltree) +#TUXBOX_APPS_LIB_PKGCONFIG(XMLTREE,tuxbox-xmltree) # fixme: decent python stuff CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS -I/usr/include/python2.3" diff --git a/main/Makefile.am b/main/Makefile.am index e0e7e79b..98c0472e 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -21,7 +21,6 @@ enigma2_LDADD_WHOLE = \ enigma2_LDADD = \ @FREETYPE_LIBS@ \ - @XMLTREE_LIBS@ \ @ID3TAG_LIBS@ \ @MAD_LIBS@ \ @PNG_LIBS@ \ |