--- crossfire-1.9.1/acinclude.m4.wiget 2006-06-29 09:25:33.000000000 +0200
+++ crossfire-1.9.1/acinclude.m4 2007-02-03 23:43:47.000000000 +0100
@@ -6,7 +6,8 @@
PY_INCLUDES=""
dir=""
if test "x$PYTHON_HOME" != "x"; then
- for dir in $PYTHON_HOME/include/python{,2.5,2.4,2.3,2.2,2.1,2.0} ; do
+ for pyver in "" 2.5 2.4 2.3 2.2 2.1 2.0 ; do
+ dir=$PYTHON_HOME/include/python${pyver}
AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])
if test "x$cf_have_python_h" != "x" ; then
PY_INCLUDES="-I$dir"
@@ -16,16 +17,21 @@
PYTHON_SEARCH=$PYTHON
else
AC_CHECK_HEADERS([Python.h],[cf_have_python_h=yes])
+ PY_INCLUDES=""
if test "x$cf_have_python_h" = "x" ; then
- for dir in /usr{,/local}/include/python{,2.5,2.4,2.3,2.2,2.1,2.0} ; do
+ for ldir in "" /local ; do
+ for pyver in "" 2.5 2.4 2.3 2.2 2.1 2.0 ; do
+ dir=/usr${ldir}/include/python${pyver}
AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])
if test "x$cf_have_python_h" != "x" ; then
PY_INCLUDES="-I$dir"
break
fi
done
- else
- PY_INCLUDES=""
+ if test "x$PY_INCLUDES" != "x" ; then
+ break
+ fi
+ done
fi
fi
@@ -61,8 +67,8 @@
fi
else
- for lib in python{,2.5,2.4,2.3,2.2,2.1,2.0} ; do
- AC_CHECK_LIB($lib, PyArg_ParseTuple,[PYTHON_LIB="-l$lib"])
+ for pyver in "" 2.5 2.4 2.3 2.2 2.1 2.0 ; do
+ AC_CHECK_LIB(python$pyver, PyArg_ParseTuple,[PYTHON_LIB="-lpython$pyver"])
if test "x$PYTHON_LIB" != "x" ; then
break
fi
@@ -374,9 +380,9 @@
EOF
AC_MSG_CHECKING([xslt compliance of $1])
to_run=$1
- to_run=${to_run/\%1/configtest.xml}
- to_run=${to_run/\%2/configtest.xsl}
- to_run=${to_run/\%3/configtest.out}
+ to_run="$(echo $to_run|sed -e 's/\%1/configtest.xml/')"
+ to_run="$(echo $to_run|sed -e 's/\%2/configtest.xsl/')"
+ to_run="$(echo $to_run|sed -e 's/\%3/configtest.out/')"
if AC_TRY_COMMAND([$to_run]);then
AC_MSG_RESULT([yes]);
[$2]
--- crossfire-1.9.1/check-fragment.am.wiget 2007-02-04 00:00:02.000000000 +0100
+++ crossfire-1.9.1/check-fragment.am 2007-02-04 00:06:01.000000000 +0100
@@ -16,8 +16,8 @@
echo '