git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add seek
[enigma2.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 1cae1aa43df7f44880b880d9c1207c0870efdf0a..ae2cf226133dac0878c2767e6dafb8048f8d4a9e 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-8,20
+8,16
@@
AC_PROG_CC
AC_PROG_CXX
AC_PROG_RANLIB
AC_PROG_CXX
AC_PROG_RANLIB
-AC_ARG_WITH(pythonincdir,
- [ --with-pythonincdir=NAME dir [[...]]],
- [PYTHON_INCDIR="$withval"],[PYTHON_INCDIR="/usr/include/python2.3"])
-AC_SUBST(PYTHON_INCDIR)
-
AC_ARG_WITH(libsdl,
AC_HELP_STRING([--with-libsdl], [use sdl, yes or no]),
[[withsdl=$withval]],
[[withsdl=yes]]
)
AC_ARG_WITH(libsdl,
AC_HELP_STRING([--with-libsdl], [use sdl, yes or no]),
[[withsdl=$withval]],
[[withsdl=yes]]
)
-AC_DEFINE_UNQUOTED([WITH_SDL],[$withsdl],[With SDL])
-
+
+AM_PATH_PYTHON(2.3)
+AC_PYTHON_DEVEL
+
TUXBOX_APPS_DVB
TUXBOX_APPS_DVB
-#TUXBOX_APPS_DRIVER
TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
#TUXBOX_APPS_LIB_PKGCONFIG(FRIBIDI,fribidi)
TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
#TUXBOX_APPS_LIB_PKGCONFIG(FRIBIDI,fribidi)
@@
-30,27
+26,28
@@
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(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(DVBSI,libdvbsi++
)
if test "$withsdl" = "yes" ; then
if test "$withsdl" = "yes" ; then
- TUXBOX_APPS_LIB_PKGCONFIG(SDL,sdl-config)
+ TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)
+ AC_DEFINE_UNQUOTED([WITH_SDL],[$withsdl],[With SDL])
fi
# fixme: decent python stuff
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 $SDL_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"
CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall"
-LDFLAGS="$LDFLAGS -rdynamic"
+LDFLAGS="$LDFLAGS -rdynamic
$PYTHON_LDFLAGS
"
TUXBOX_APPS_GETTEXT
AC_OUTPUT([
Makefile
TUXBOX_APPS_GETTEXT
AC_OUTPUT([
Makefile
+data/Makefile
lib/Makefile
lib/actions/Makefile
lib/base/Makefile
lib/driver/Makefile
lib/dvb/Makefile
lib/Makefile
lib/actions/Makefile
lib/base/Makefile
lib/driver/Makefile
lib/dvb/Makefile
-lib/dvb_si/Makefile
lib/dvb_ci/Makefile
lib/gdi/Makefile
lib/gui/Makefile
lib/dvb_ci/Makefile
lib/gdi/Makefile
lib/gui/Makefile