X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=acinclude.m4;h=4ece919bcc32d296ecb815063c685a08d758ec0c;hb=41cc6780ed5e448690ac4663f3e0fa8d5d0cd0f8;hp=385008dadabb27eeaf93061a4232d84a9b8bb272;hpb=21baac81361a8a27f980cbcaaf2f97e130cbdef0;p=vuplus_dvbapp

diff --git a/acinclude.m4 b/acinclude.m4
index 385008d..4ece919 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,5 +1,4 @@
 AC_DEFUN(TUXBOX_APPS,[
-AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
 INSTALL="$INSTALL -p"
@@ -247,6 +246,18 @@ AC_SUBST($1_CFLAGS)
 AC_SUBST($1_LIBS)
 ])
 
+AC_DEFUN(_TUXBOX_APPS_LIB_PKGCONFIG_OPTIONAL,[
+PKG_CHECK_MODULES($1,$2,$3="yes",$3="no")
+if test "$$3" = "yes"; then
+	AC_DEFINE($3, 1, [$2 available])
+else
+	$1_CFLAGS=""
+	$1_LIBS=""
+fi
+AC_SUBST($1_CFLAGS)
+AC_SUBST($1_LIBS)
+])
+
 AC_DEFUN(TUXBOX_APPS_LIB_PKGCONFIG,[
 _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
 if test -z "$$1_CFLAGS" ; then
@@ -399,7 +410,10 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
 
         # Check for Python include path
         AC_MSG_CHECKING([for Python include path])
-        python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
+        # FIXME:
+        # we hardcode for i686 host and mipsel target here.
+        # the whole thing is broken. fix this.
+        python_path=`echo $PYTHON | sed "s,/bin.*$,," | sed "s,i686,mipsel,"`
         for i in "$python_path/include/python$PYTHON_VERSION/" "$python_path/include/python/" "$python_path/" ; do
                 python_path=`find $i -type f -name Python.h -print | sed "1q"`
                 if test -n "$python_path" ; then