git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- back to CXXLINK instead of hardcoded g++ - should work now.
[enigma2.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index f1061ae5ef24b9d1e23387bfe2db06b27004d7dc..190c02ac5c4705cfeb99b7e10564146ef54a948d 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-8,6
+8,11
@@
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)
+
TUXBOX_APPS_DVB
#TUXBOX_APPS_DRIVER
TUXBOX_APPS_DVB
#TUXBOX_APPS_DRIVER
@@
-18,17
+23,20
@@
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(XMLTREE,tuxbox-xmltree)
+TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)
# fixme: decent python stuff
# 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
"
+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
"
CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall"
CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -Wall"
+LDFLAGS="$LDFLAGS -rdynamic"
TUXBOX_APPS_GETTEXT
AC_OUTPUT([
Makefile
lib/Makefile
TUXBOX_APPS_GETTEXT
AC_OUTPUT([
Makefile
lib/Makefile
+lib/actions/Makefile
lib/base/Makefile
lib/driver/Makefile
lib/dvb/Makefile
lib/base/Makefile
lib/driver/Makefile
lib/dvb/Makefile
@@
-39,6
+47,6
@@
lib/nav/Makefile
lib/network/Makefile
lib/python/Makefile
lib/service/Makefile
lib/network/Makefile
lib/python/Makefile
lib/service/Makefile
+lib/components/Makefile
main/Makefile
])
main/Makefile
])
-