1 --- gdal-1.3.2/m4/acinclude.m4.orig 2006-04-24 19:19:28.000000000 +0200
2 +++ gdal-1.3.2/m4/acinclude.m4 2006-12-11 23:25:37.569594186 +0100
6 ARCH=`uname -i 2>/dev/null`
8 - if test "$ARCH" = "x86_64" ; then
11 + PYLIB="`$PYTHON -c '
15 if test "$PYTHON" != no ; then
16 AC_MSG_CHECKING([where python Makefiles are])
18 AC_MSG_CHECKING([for python headers])
19 AC_CACHE_VAL(am_cv_python_includes,
21 - am_cv_python_includes="`$PYTHON -c '
22 + am_cv_python_includes="$($PYTHON -c '
24 -includepy = \"%s/include/python%s\" % (sys.prefix, sys.version[:3])
25 -if sys.version[0] > \"1\" or sys.version[2] > \"4\":
26 - libpl = \"%s/include/python%s\" % (sys.exec_prefix, sys.version[:3])
27 +includepy = "%s/include/python%s" % (sys.prefix, sys.version[:3])
28 +if sys.version[0] > "1" or sys.version[2] > "4":
29 + libpl = "%s/include/python%s" % (sys.exec_prefix, sys.version[:3])
31 - libpl = \"%s/'$PYLIB'/python%s/config\" % (sys.exec_prefix, sys.version[:3])
32 -print \"-I%s -I%s\" % (includepy, libpl)'`"
33 + libpl = "%s/'$PYLIB'/python%s/config" % (sys.exec_prefix, sys.version[:3])
34 +print "-I%s -I%s" % (includepy, libpl)')"
36 PYTHON_INCLUDES="$am_cv_python_includes"
39 AC_CACHE_VAL(am_cv_python_makefile,
41 if test ! -z "`uname -a | grep CYGWIN`" ; then
42 - PYTHON_LIBS="`$PYTHON -c '
43 + PYTHON_LIBS="$($PYTHON -c '
45 -print \"-L%s/'$PYLIB'/python%s/config -lpython%s.dll\" % (sys.prefix, sys.version[:3], sys.version[:3])'`"
46 +print "-L%s/'$PYLIB'/python%s/config -lpython%s.dll" % (sys.prefix, sys.version[:3], sys.version[:3])')"
48 - py_makefile="`$PYTHON -c '
49 + py_makefile="$($PYTHON -c '
51 -print \"%s/'$PYLIB'/python%s/config/Makefile\"%(sys.exec_prefix, sys.version[:3])'`"
52 +print "%s/'$PYLIB'/python%s/config/Makefile"%(sys.exec_prefix, sys.version[:3])')"
53 if test ! -f "$py_makefile"; then
54 echo Could not find the python config makefile. Maybe you are;
55 echo missing the development portion of the python installation;