X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8d8294b4b354436adde202604fffb55c181d686c..9fac5ff7371972cef663d456b96c68f51b5c2c01:/acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index b92d02fa..385008da 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -125,13 +125,13 @@ TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts,
 TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games,
 	[--with-gamesdir=PATH    ],[where games data is stored])
 
-TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox,
+TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,,
 	[--with-libdir=PATH      ],[where to find the internal libs])
 
 TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
 	[--with-plugindir=PATH   ],[where to find the plugins])
 
-TUXBOX_APPS_DIRECTORY_ONE(tuxboxdatadir,TUXBOXDATADIR,datadir,/share,/tuxbox,
+TUXBOX_APPS_DIRECTORY_ONE(tuxboxdatadir,TUXBOXDATADIR,datadir,/share,,
 	[--with-tuxboxdatadir=PATH],[where to find tuxbox data])
 
 TUXBOX_APPS_DIRECTORY_ONE(zoneinfodir,ZONEINFODIR,datadir,/share,/zoneinfo,
@@ -391,3 +391,44 @@ AC_DEFUN([AC_PROG_EGREP],
  AC_SUBST([EGREP])
 ])
 
+AC_DEFUN([AC_PYTHON_DEVEL],[
+        #
+        # should allow for checking of python version here...
+        #
+        AC_REQUIRE([AM_PATH_PYTHON])
+
+        # Check for Python include path
+        AC_MSG_CHECKING([for Python include path])
+        python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
+        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
+                        break
+                fi
+        done
+        python_path=`echo $python_path | sed "s,/Python.h$,,"`
+        AC_MSG_RESULT([$python_path])
+        if test -z "$python_path" ; then
+                AC_MSG_ERROR([cannot find Python include path])
+        fi
+        AC_SUBST([PYTHON_CPPFLAGS],[-I$python_path])
+
+        # Check for Python library path
+        AC_MSG_CHECKING([for Python library path])
+        python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
+        for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
+                python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
+                if test -n "$python_path" ; then
+                        break
+                fi
+        done
+        python_path=`echo $python_path | sed "s,/libpython.*$,,"`
+        AC_MSG_RESULT([$python_path])
+        if test -z "$python_path" ; then
+                AC_MSG_ERROR([cannot find Python library path])
+        fi
+        AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -lpython$PYTHON_VERSION"])
+        #
+        python_site=`echo $python_path | sed "s/config/site-packages/"`
+        AC_SUBST([PYTHON_SITE_PKG],[$python_site])
+])