1 --- gdal-1.3.2/configure.in.orig 2006-12-11 23:03:29.053886000 +0100
2 +++ gdal-1.3.2/configure.in 2006-12-11 23:08:09.409862968 +0100
7 - AC_MSG_RESULT([no])LIBZ
11 if test -d $PG_CONFIG ; then
14 LIBS="$LIBS -L$with_sqlite/lib -lsqlite3"
15 SQLITE_INC="-I$with_sqlite/include"
16 - AC_MSG_RESULT(setting DODS root directory to $with_sqlite)_
17 + AC_MSG_RESULT(setting DODS root directory to $with_sqlite)
21 --- gdal-1.3.2/m4/acinclude.m4.orig 2006-04-24 19:19:28.000000000 +0200
22 +++ gdal-1.3.2/m4/acinclude.m4 2006-12-11 23:25:37.569594186 +0100
26 ARCH=`uname -i 2>/dev/null`
28 - if test "$ARCH" = "x86_64" ; then
31 + PYLIB="`$PYTHON -c '
35 if test "$PYTHON" != no ; then
36 AC_MSG_CHECKING([where python Makefiles are])
38 AC_MSG_CHECKING([for python headers])
39 AC_CACHE_VAL(am_cv_python_includes,
41 - am_cv_python_includes="`$PYTHON -c '
42 + am_cv_python_includes="$($PYTHON -c '
44 -includepy = \"%s/include/python%s\" % (sys.prefix, sys.version[:3])
45 -if sys.version[0] > \"1\" or sys.version[2] > \"4\":
46 - libpl = \"%s/include/python%s\" % (sys.exec_prefix, sys.version[:3])
47 +includepy = "%s/include/python%s" % (sys.prefix, sys.version[:3])
48 +if sys.version[0] > "1" or sys.version[2] > "4":
49 + libpl = "%s/include/python%s" % (sys.exec_prefix, sys.version[:3])
51 - libpl = \"%s/'$PYLIB'/python%s/config\" % (sys.exec_prefix, sys.version[:3])
52 -print \"-I%s -I%s\" % (includepy, libpl)'`"
53 + libpl = "%s/'$PYLIB'/python%s/config" % (sys.exec_prefix, sys.version[:3])
54 +print "-I%s -I%s" % (includepy, libpl)')"
56 PYTHON_INCLUDES="$am_cv_python_includes"
59 AC_CACHE_VAL(am_cv_python_makefile,
61 if test ! -z "`uname -a | grep CYGWIN`" ; then
62 - PYTHON_LIBS="`$PYTHON -c '
63 + PYTHON_LIBS="$($PYTHON -c '
65 -print \"-L%s/'$PYLIB'/python%s/config -lpython%s.dll\" % (sys.prefix, sys.version[:3], sys.version[:3])'`"
66 +print "-L%s/'$PYLIB'/python%s/config -lpython%s.dll" % (sys.prefix, sys.version[:3], sys.version[:3])')"
68 - py_makefile="`$PYTHON -c '
69 + py_makefile="$($PYTHON -c '
71 -print \"%s/'$PYLIB'/python%s/config/Makefile\"%(sys.exec_prefix, sys.version[:3])'`"
72 +print "%s/'$PYLIB'/python%s/config/Makefile"%(sys.exec_prefix, sys.version[:3])')"
73 if test ! -f "$py_makefile"; then
74 echo Could not find the python config makefile. Maybe you are;
75 echo missing the development portion of the python installation;