git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dont show the infobar when close the last open screen
[enigma2.git]
/
acinclude.m4
diff --git
a/acinclude.m4
b/acinclude.m4
index e58d27518bf679bda0caa8acaa2a4662ffb2aac1..4ece919bcc32d296ecb815063c685a08d758ec0c 100644
(file)
--- a/
acinclude.m4
+++ b/
acinclude.m4
@@
-246,6
+246,18
@@
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
])
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
AC_DEFUN(TUXBOX_APPS_LIB_PKGCONFIG,[
_TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
if test -z "$$1_CFLAGS" ; then
@@
-398,7
+410,10
@@
AC_DEFUN([AC_PYTHON_DEVEL],[
# Check for Python include path
AC_MSG_CHECKING([for Python include path])
# 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
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