X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgr_python.m4;h=7aef1662e0a6fb787eb5ed5f7b1f317498e22413;hb=refs%2Fheads%2Ftry-3.3.1;hp=760a0f74a75ef183a24298d73ea3aad42e6aa0c7;hpb=5d69a524f81f234b3fbc41d49ba18d6f6886baba;p=debian%2Fgnuradio

diff --git a/config/gr_python.m4 b/config/gr_python.m4
index 760a0f74..7aef1662 100644
--- a/config/gr_python.m4
+++ b/config/gr_python.m4
@@ -5,7 +5,7 @@ dnl This file is part of GNU Radio
 dnl 
 dnl GNU Radio is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
+dnl the Free Software Foundation; either version 3, or (at your option)
 dnl any later version.
 dnl 
 dnl GNU Radio is distributed in the hope that it will be useful,
@@ -15,27 +15,50 @@ dnl GNU General Public License for more details.
 dnl 
 dnl You should have received a copy of the GNU General Public License
 dnl along with GNU Radio; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl Boston, MA 02111-1307, USA.
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
 dnl 
 
 # PYTHON_DEVEL()
 #
 # Checks for Python and tries to get the include path to 'Python.h'.
-# It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) output variables.
+# It sets the $(PYTHON_CPPFLAGS), $(PYTHON_LDFLAGS) and $(pythondir) output variables,
 #
 AC_DEFUN([PYTHON_DEVEL],[
 	AC_REQUIRE([AM_PATH_PYTHON])
 	AC_REQUIRE([AC_CANONICAL_HOST])
 
-	# Check for Python include path
-	AC_MSG_CHECKING([for Python include path])
-	if test -z "$PYTHON" ; then
-		AC_MSG_ERROR([cannot find Python path])
-	fi
+	AC_ARG_WITH(pythondir,
+                    AC_HELP_STRING([--with-pythondir=DIR], 
+                       [python installation directory (cross-compiling) [[default=$prefix/lib/python2.5/site-packages]]]),
+		    [with_pythondir=${withval}],[with_pythondir=${prefix}/lib/python2.5/site-packages])
+
+	# if we're cross-compiling, asking the host python about any of
+	# this is completely useless...
+
+	if test x$cross_compiling != xno
+	then
+		pythondir=$with_pythondir
+		pyexecdir=$with_pythondir
+		AC_SUBST(PYTHON_CPPFLAGS)
+		AC_SUBST(PYTHON_LDFLAGS)
+        else
 
-	# ask distutils which include path we should use
-	python_cmd='
+	    # For Fedora Core 5 and 6, see ticket:39 in Trac
+	    if test -f '/etc/redhat-release'; then
+		    if  (echo $pyexecdir | grep -q lib64); then
+			    pythondir="$pyexecdir"
+		    fi
+	    fi
+
+	    # Check for Python include path
+	    AC_MSG_CHECKING([for Python include path])
+	    if test -z "$PYTHON" ; then
+		    AC_MSG_ERROR([cannot find Python path])
+	    fi
+
+	    # ask distutils which include path we should use
+	    python_cmd='
 import distutils.sysconfig
 import os
 path = distutils.sysconfig.get_python_inc(plat_specific=False)
@@ -43,30 +66,30 @@ if os.sep == "\\":
   path = path.replace("\\", "/")
 print path
 '
-	python_path=`$PYTHON -c "$python_cmd"`
-	AC_MSG_RESULT([$python_path])
-	if test -z "$python_path" ; then
-		AC_MSG_ERROR([cannot find Python include path])
-	fi
+	    python_path=`$PYTHON -c "$python_cmd"`
+	    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])
+	    AC_SUBST(PYTHON_CPPFLAGS,[-I$python_path])
 
-	# Check for Python headers usability
-	python_save_CPPFLAGS=$CPPFLAGS
-	CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
-	AC_CHECK_HEADERS([Python.h], [],
-			[AC_MSG_ERROR([cannot find usable Python headers])])
-	CPPFLAGS="$python_save_CPPFLAGS"
+	    # Check for Python headers usability
+	    python_save_CPPFLAGS=$CPPFLAGS
+	    CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
+	    AC_CHECK_HEADERS([Python.h], [],
+			    [AC_MSG_ERROR([cannot find usable Python headers])])
+	    CPPFLAGS="$python_save_CPPFLAGS"
 
-	# Only set this on mingw and cygwin hosts, (only implemented
-	# for mingw host, for crosscompiling you need to trick this)
+	    # Only set this on mingw and cygwin hosts, (only implemented
+	    # for mingw host, for crosscompiling you need to trick this)
 
-	PYTHON_LDFLAGS=""
-	case $host_os in
-	     *mingw* | *cygwin* )
-	  AC_MSG_CHECKING([for Python LDFLAGS])
+	    PYTHON_LDFLAGS=""
+	    case $host_os in
+		 *mingw* | *cygwin* )
+	      AC_MSG_CHECKING([for Python LDFLAGS])
 
-        python_cmd='
+	    python_cmd='
 import distutils.sysconfig
 import os
 path = distutils.sysconfig.get_config_var("LIBPL")
@@ -75,42 +98,77 @@ if path == None:
 if os.sep == "\\":
   path = path.replace("\\", "/")
 print path
-'      
-	  python_stdlib_path=`$PYTHON -c "$python_cmd"`
-
-	  python_version_nodot=`echo $PYTHON_VERSION | sed "s,\.,,"`
-	  libpython_name="python$PYTHON_VERSION"
-
-	  # Standard install of python for win32 has libpython24.a
-	  # instead of libpython2.4.a so we check for the library
-	  # without the dot in the version number.
-
-	  python_stdlib_filename=`find $python_stdlib_path -type f -name libpython$python_version_nodot.* -print | sed "1q"`
-	  if test -n "$python_stdlib_filename" ; then
-	  	libpython_name="python$python_version_nodot"
-	  fi
-
-          PYTHON_LDFLAGS="-L$python_stdlib_path -l$libpython_name"
-          AC_MSG_RESULT($PYTHON_LDFLAGS) 
-          # Replace all backslashes in PYTHON Paths with forward slashes
-          AC_MSG_CHECKING([for pythondir])
-          pythondir=`echo $pythondir |sed 's,\\\\,/,g'`
-          AC_MSG_RESULT($pythondir)
-          AC_SUBST([pythondir])
-          AC_MSG_CHECKING([for pkgpythondir])
-          pkgpythondir=`echo $pkgpythondir |sed 's,\\\\,/,g'`
-          AC_MSG_RESULT($pkgpythondir)
-          AC_SUBST([pkgpythondir])
-          AC_MSG_CHECKING([for pyexecdir])
-          pyexecdir=`echo $pyexecdir |sed 's,\\\\,/,g'`
-          AC_MSG_RESULT($pyexecdir)
-          AC_SUBST([pyexecdir])
-          AC_MSG_CHECKING([for pkgpyexecdir])
-          pkgpyexecdir=`echo $pkgpyexecdir |sed 's,\\\\,/,g'`
-          AC_MSG_RESULT($pkgpyexecdir)
-          AC_SUBST([pkgpyexecdir])
-	  ;;
-        esac
-
-	AC_SUBST([PYTHON_LDFLAGS])
+'
+	      python_stdlib_path=`$PYTHON -c "$python_cmd"`
+
+	      python_version_nodot=`echo $PYTHON_VERSION | sed "s,\.,,"`
+	      libpython_name="python$PYTHON_VERSION"
+
+	      # Standard install of python for win32 has libpython24.a
+	      # instead of libpython2.4.a so we check for the library
+	      # without the dot in the version number.
+
+	      python_stdlib_filename=`find $python_stdlib_path -type f -name libpython$python_version_nodot.* -print | sed "1q"`
+	      if test -n "$python_stdlib_filename" ; then
+		    libpython_name="python$python_version_nodot"
+	      fi
+
+	      PYTHON_LDFLAGS="-L$python_stdlib_path -l$libpython_name"
+	      AC_MSG_RESULT($PYTHON_LDFLAGS) 
+	      # Replace all backslashes in PYTHON Paths with forward slashes
+	      pythondir=`echo $pythondir |sed 's,\\\\,/,g'`
+	      pkgpythondir=`echo $pkgpythondir |sed 's,\\\\,/,g'`
+	      pyexecdir=`echo $pyexecdir |sed 's,\\\\,/,g'`
+	      pkgpyexecdir=`echo $pkgpyexecdir |sed 's,\\\\,/,g'`
+	      ;;
+	    esac
+
+	    case $host_os in
+		 *mingw* )
+	      # Python 2.5 requires ".pyd" instead of ".dll" for extensions
+	      PYTHON_LDFLAGS="-shrext .pyd ${PYTHON_LDFLAGS}"
+	    esac
+
+	    AC_SUBST(PYTHON_LDFLAGS)
+	fi
+])
+
+# PYTHON_CHECK_MODULE
+#
+# Determines if a particular Python module can be imported
+#
+# $1 - module name
+# $2 - module description
+# $3 - action if found
+# $4 - action if not found
+# $5 - test command
+
+AC_DEFUN([PYTHON_CHECK_MODULE],[
+    AC_MSG_CHECKING([for $2])
+    dnl ########################################
+    dnl # import and test checking
+    dnl ########################################
+    if test "$5"; then
+        python_cmd='
+try:
+    import $1
+    assert $5
+except ImportError, AssertionError: exit(1)
+except: pass'
+    dnl ########################################
+    dnl # import checking only
+    dnl ########################################
+    else
+        python_cmd='
+try: import $1
+except ImportError: exit(1)
+except: pass'
+    fi
+    if ! $PYTHON -c "$python_cmd" 2> /dev/null; then
+        AC_MSG_RESULT([no])
+        $4
+    else
+        AC_MSG_RESULT([yes])
+        $3
+    fi
 ])