From 38d8389ce8040c46652fc27d2e2a8980bbc6af52 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Sat, 8 Oct 2005 00:34:18 +0000 Subject: [PATCH] use proper python autofoo stuff --- configure.ac | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index e598b76..ae2cf22 100644 --- a/configure.ac +++ b/configure.ac @@ -8,19 +8,16 @@ AC_PROG_CC AC_PROG_CXX AC_PROG_RANLIB -AC_ARG_WITH(pythonincdir, - [ --with-pythonincdir=NAME dir [[...]]], - [PYTHON_INCDIR="$withval"],[PYTHON_INCDIR="/usr/include/python2.4"]) -AC_SUBST(PYTHON_INCDIR) - AC_ARG_WITH(libsdl, AC_HELP_STRING([--with-libsdl], [use sdl, yes or no]), [[withsdl=$withval]], [[withsdl=yes]] ) - + +AM_PATH_PYTHON(2.3) +AC_PYTHON_DEVEL + TUXBOX_APPS_DVB -#TUXBOX_APPS_DRIVER TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config) #TUXBOX_APPS_LIB_PKGCONFIG(FRIBIDI,fribidi) @@ -30,16 +27,16 @@ TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad) TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng) TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-1.2) TUXBOX_APPS_LIB_PKGCONFIG(DVBSI,libdvbsi++) -#TUXBOX_APPS_LIB_PKGCONFIG(XMLTREE,tuxbox-xmltree) + if test "$withsdl" = "yes" ; then TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config) AC_DEFINE_UNQUOTED([WITH_SDL],[$withsdl],[With SDL]) fi # fixme: decent python stuff -CPPFLAGS="$CPPFLAGS $MD5SUM_CFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS $DVBSI_CFLAGS -I$PYTHON_INCDIR -DHAVE_CPP_FILT -DMEMLEAK_CHECK" +CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS $MD5SUM_CFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS $DVBSI_CFLAGS -DHAVE_CPP_FILT -DMEMLEAK_CHECK" CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall" -LDFLAGS="$LDFLAGS -rdynamic" +LDFLAGS="$LDFLAGS -rdynamic $PYTHON_LDFLAGS" TUXBOX_APPS_GETTEXT -- 2.7.4