1 --- crossfire-1.9.1/acinclude.m4.wiget 2006-06-29 09:25:33.000000000 +0200
2 +++ crossfire-1.9.1/acinclude.m4 2007-02-03 23:43:47.000000000 +0100
6 if test "x$PYTHON_HOME" != "x"; then
7 - for dir in $PYTHON_HOME/include/python{,2.5,2.4,2.3,2.2,2.1,2.0} ; do
8 + for pyver in "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
9 + dir=$PYTHON_HOME/include/python${pyver}
10 AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])
11 if test "x$cf_have_python_h" != "x" ; then
16 AC_CHECK_HEADERS([Python.h],[cf_have_python_h=yes])
18 if test "x$cf_have_python_h" = "x" ; then
19 - for dir in /usr{,/local}/include/python{,2.5,2.4,2.3,2.2,2.1,2.0} ; do
20 + for ldir in "" /local ; do
21 + for pyver in "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
22 + dir=/usr${ldir}/include/python${pyver}
23 AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])
24 if test "x$cf_have_python_h" != "x" ; then
31 + if test "x$PY_INCLUDES" != "x" ; then
42 - for lib in python{,2.5,2.4,2.3,2.2,2.1,2.0} ; do
43 - AC_CHECK_LIB($lib, PyArg_ParseTuple,[PYTHON_LIB="-l$lib"])
44 + for pyver in "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
45 + AC_CHECK_LIB(python$pyver, PyArg_ParseTuple,[PYTHON_LIB="-lpython$pyver"])
46 if test "x$PYTHON_LIB" != "x" ; then
51 AC_MSG_CHECKING([xslt compliance of $1])
53 - to_run=${to_run/\%1/configtest.xml}
54 - to_run=${to_run/\%2/configtest.xsl}
55 - to_run=${to_run/\%3/configtest.out}
56 + to_run="$(echo $to_run|sed -e 's/\%1/configtest.xml/')"
57 + to_run="$(echo $to_run|sed -e 's/\%2/configtest.xsl/')"
58 + to_run="$(echo $to_run|sed -e 's/\%3/configtest.out/')"
59 if AC_TRY_COMMAND([$to_run]);then
62 --- crossfire-1.10.0/check-fragment.am.wiget 2007-02-04 00:00:02.000000000 +0100
63 +++ crossfire-1.10.0/check-fragment.am 2007-02-04 00:06:01.000000000 +0100
64 @@ -16,8 +16,8 @@ automenu:
65 echo '<?xml version="1.0"?><menu>' > $$output_menu; \
66 echo '<parentMenu>$(CHECK_PARENT_NAME)</parentMenu>' >> $$output_menu;\
67 for tst in $$list; do \
68 - tst="$${tst/check_/}" ; \
69 - tst="$${tst/-/_}" ; \
70 + tst=$$(echo $$tst|sed -e 's/check_//') ; \
71 + tst=$$(echo $$tst|sed -e'/-/_/') ; \
72 xml="$(LOGDIR)/$${tst}.xml" ;\
73 if test -e "$$xml"; then \
74 successCount=`grep -c 'result="success"' $$xml`;\
75 @@ -39,14 +39,14 @@ logreport: automenu
76 srcdir='$(top_srcdir)'; \
77 xsl="$${srcdir}/test/templates/logresult.xsl" ; \
78 xsltproc='$(XSLTENGINE)';\
79 - xsltproc=$${xsltproc/\%2/$$xsl};\
80 + xsltproc=$$(echo $$xsltproc|sed -e "/\%2/$$xsl/");\
81 xml_siteuri='$(CHECK_ROOT)' ;\
82 xml_check_folder='../logs/$(CHECK_FOLDER)' ;\
83 runxml='.autorun.xml';\
84 if test -n "$$list"; then \
85 for tst in $$list; do \
86 - tst="$${tst/check_/}" ; \
87 - tst="$${tst/-/_}" ; \
88 + tst=$$(echo $$tst|sed -e "s/check_//") ; \
89 + tst=$$(echo $$tst|sed -e "/-/_/") ; \
90 checkFile="$${tst}.xml" ;\
91 echo '<?xml version="1.0"?><config>' > $$runxml;\
92 echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\
93 @@ -54,8 +54,8 @@ logreport: automenu
94 echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\
95 html=$(LOGDIR)/$${tst}.html ;\
96 if test -e "$(LOGDIR)/$$xml"; then \
97 - torun="$${xsltproc/\%1/$$runxml}";\
98 - torun="$${torun/\%3/$$html}";\
99 + torun=$$(echo $$xsltproc|sed -e "/\%1/$$runxml/");\
100 + torun=$$(echo $$torun|sed -e "s/\%3/$$html/");\
101 echo "running $$torun";\
104 @@ -65,8 +65,8 @@ logreport: automenu
105 echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\
106 echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\
107 html='$(LOGDIR)/.index.html' ;\
108 - torun="$${xsltproc/\%1/$$runxml}";\
109 - torun="$${torun/\%3/$$html}";\
110 + torun=$$(echo $$xsltproc|sed -e "s/\%1/$$runxml/");\
111 + torun=$$(echo $$torun|sed -e "s/\%3/$$html/');\
112 echo "running $$torun";\
114 template-copy: $(LOGDIR)
115 @@ -79,7 +79,7 @@ textlog:
116 @srcdir='$(top_srcdir)'; \
117 xsl="$${srcdir}/test/templates/checkTextResult.xsl" ; \
118 xsltproc='$(XSLTENGINE)';\
119 - xsltproc="$${xsltproc/\%2/$$xsl}";\
120 + xsltproc=$$(echo $$xsltproc|sed -e "s/\%2/$$xsl/");\
121 xml_siteuri='$(CHECK_ROOT)' ;\
122 xml_check_folder='../logs/$(CHECK_FOLDER)' ;\
123 runxml='.autorun.xml';\
124 @@ -87,8 +87,8 @@ textlog:
125 echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\
126 echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\
127 txt='$(LOGDIR)/testlog.txt' ;\
128 - torun="$${xsltproc/\%1/$$runxml}";\
129 - torun="$${torun/\%3/$$txt}";\
130 + torun=$$(echo $$xsltproc|sed -e "s/\%1/$$runxml/");\
131 + torun=$$(echo $$torun|sed -e "s/\%3/$$txt/");\
132 echo "running $$torun";\