X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4a3d38617c701db3a97adca1ff78a63be72aee92..6c77c3ab8156d72dfd616d83c276ef7f3ca1b1a7:/acinclude.m4?ds=sidebyside

diff --git a/acinclude.m4 b/acinclude.m4
index 0afc653a..6f1cb0a3 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,5 +1,4 @@
 AC_DEFUN([TUXBOX_APPS],[
-AM_MAINTAINER_MODE
 
 INSTALL="$INSTALL -p"
 
@@ -115,61 +114,20 @@ TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,sysconfdir,/etc,,
 TUXBOX_APPS_DIRECTORY_ONE(datadir,DATADIR,datadir,/share,,
 	[--with-datadir=PATH     ],[where to find data])
 
-TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share,/locale,
-	[--with-localedir=PATH ],[where to find locales])
-
 TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts,
 	[--with-fontdir=PATH     ],[where to find the fonts])
 
-TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games,
-	[--with-gamesdir=PATH    ],[where games data is stored])
-
 TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,,
 	[--with-libdir=PATH      ],[where to find the internal libs])
-
-TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
-	[--with-plugindir=PATH   ],[where to find the plugins])
-
-TUXBOX_APPS_DIRECTORY_ONE(tuxboxdatadir,TUXBOXDATADIR,datadir,/share,,
-	[--with-tuxboxdatadir=PATH],[where to find tuxbox data])
-
-TUXBOX_APPS_DIRECTORY_ONE(zoneinfodir,ZONEINFODIR,datadir,/share,/zoneinfo,
-	[--with-zoneinfodir=PATH ],[where to find zoneinfo db])
 ])
 
 dnl automake <= 1.6 needs this specifications
 AC_SUBST(CONFIGDIR)
 AC_SUBST(DATADIR)
-AC_SUBST(ZONEINFODIR)
 AC_SUBST(FONTDIR)
-AC_SUBST(GAMESDIR)
 AC_SUBST(LIBDIR)
-AC_SUBST(LOCALEDIR)
-AC_SUBST(PLUGINDIR)
-AC_SUBST(TUXBOXDATADIR)
 dnl end workaround
 
-AC_DEFUN([TUXBOX_APPS_ENDIAN],[
-AC_CHECK_HEADERS(endian.h)
-AC_C_BIGENDIAN
-])
-
-AC_DEFUN([TUXBOX_APPS_DRIVER],[
-#AC_ARG_WITH(driver,
-#	[  --with-driver=PATH      path for driver sources [[NONE]]],
-#	[DRIVER="$withval"],[DRIVER=""])
-#
-#if test -d "$DRIVER/include"; then
-#	AC_DEFINE(HAVE_DBOX2_DRIVER,1,[Define to 1 if you have the dbox2 driver sources])
-#else
-#	AC_MSG_ERROR([can't find driver sources])
-#fi
-
-#AC_SUBST(DRIVER)
-
-#CPPFLAGS="$CPPFLAGS -I$DRIVER/include"
-])
-
 AC_DEFUN([TUXBOX_APPS_DVB],[
 AC_ARG_WITH(dvbincludes,
 	[  --with-dvbincludes=PATH  path for dvb includes [[NONE]]],
@@ -415,6 +373,7 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
 		python_path=
 		for i in $CPPFLAGS ; do
 			p=`echo $i | sed "s,^-I,,"`
+			p=`echo $p | sed "s,^-isystem,,"`
 			if test -f "$p/python$cross_PYTHON_VERSION/Python.h"; then
 				python_path="$p/python$cross_PYTHON_VERSION"
 				break