[packages/crossfire.git] / crossfire-ac260.patch

--- 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.6 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.6 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.6 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 '<?xml version="1.0"?><menu>' > $$output_menu; \
 	echo '<parentMenu>$(CHECK_PARENT_NAME)</parentMenu>' >> $$output_menu;\
 	for tst in $$list; do \
-	  tst=$${tst/check_/} ; \
-	  tst=$${tst/-/_} ; \
+	  tst=$$(echo $$tst|sed -e 's/check_//') ; \
+	  tst=$$(echo $$tst|sed -e'/-/_/') ; \
 	  xml=$(LOGDIR)/$${tst}.xml ;\
 	  if test -e "$$xml"; then \
 	      successCount=`grep -c 'result="success"' $$xml`;\
@@ -39,14 +39,14 @@
 	srcdir='$(top_srcdir)'; \
 	xsl=$${srcdir}/test/templates/logresult.xsl ; \
 	xsltproc='$(XSLTENGINE)';\
-	xsltproc=$${xsltproc/\%2/$$xsl};\
+	xsltproc=$$(echo $$xsltproc|sed -e "/\%2/$$xsl/");\
 	xml_siteuri='$(CHECK_ROOT)' ;\
 	xml_check_folder='../logs/$(CHECK_FOLDER)' ;\
 	runxml='.autorun.xml';\
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
-	    tst=$${tst/check_/} ; \
-	    tst=$${tst/-/_} ; \
+	    tst=$$(echo $$tst|sed -e "s/check_//") ; \
+	    tst=$$(echo $$tst|sed -e "/-/_/") ; \
 	    checkFile=$${tst}.xml ;\
 	    echo '<?xml version="1.0"?><config>' > $$runxml;\
 	    echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\
@@ -54,8 +54,8 @@
 	    echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\
 	    html=$(LOGDIR)/$${tst}.html ;\
 	    if test -e "$(LOGDIR)/$$xml"; then \
-	        torun=$${xsltproc/\%1/$$runxml};\
-	        torun=$${torun/\%3/$$html};\
+	        torun=$$(echo $$xsltproc|sed -e "/\%1/$$runxml/");\
+	        torun=$$(echo $$torun|sed -e "s/\%3/$$html/");\
 	        echo "running $$torun";\
 	        $$torun; \
 	    fi; \
@@ -65,8 +65,8 @@
 	echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\
 	echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\
 	html=$(LOGDIR)/.index.html ;\
-	torun=$${xsltproc/\%1/$$runxml};\
-	torun=$${torun/\%3/$$html};\
+	torun=$$(echo $$xsltproc|sed -e "s/\%1/$$runxml/");\
+	torun=$$(echo $$torun|sed -e "s/\%3/$$html/');\
 	echo "running $$torun";\
 	$$torun;
 template-copy: $(LOGDIR)
@@ -79,7 +79,7 @@
 	@srcdir='$(top_srcdir)'; \
 	xsl=$${srcdir}/test/templates/checkTextResult.xsl ; \
 	xsltproc='$(XSLTENGINE)';\
-	xsltproc=$${xsltproc/\%2/$$xsl};\
+	xsltproc=$$(echo $$xsltproc|sed -e "s/\%2/$$xsl/");\
 	xml_siteuri='$(CHECK_ROOT)' ;\
 	xml_check_folder='../logs/$(CHECK_FOLDER)' ;\
 	runxml='.autorun.xml';\
@@ -87,8 +87,8 @@
 	echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\
 	echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\
 	txt=$(LOGDIR)/testlog.txt ;\
-	torun=$${xsltproc/\%1/$$runxml};\
-	torun=$${torun/\%3/$$txt};\
+	torun=$$(echo $$xsltproc|sed -e "s/\%1/$$runxml/");\
+	torun=$$(echo $$torun|sed -e "s/\%3/$$txt/");\
 	echo "running $$torun";\
 	$$torun;
 
@@ -100,4 +100,4 @@
 check-text: $(CHECK_TXT)
 clean-unit:
 	rm -f autorun.xml
-noinst_PROGRAMS=$(TESTS)
\ Brak znaku nowej linii na końcu pliku
+noinst_PROGRAMS=$(TESTS)
Commit	Line	Data
1cd8df9f AF	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
	3	@@ -6,7 +6,8 @@
	4	PY_INCLUDES=""
	5	dir=""
	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
1311ddd6	8	+ for pyver in "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
1cd8df9f AF	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
	12	PY_INCLUDES="-I$dir"
	13	@@ -16,16 +17,21 @@
	14	PYTHON_SEARCH=$PYTHON
	15	else
	16	AC_CHECK_HEADERS([Python.h],[cf_have_python_h=yes])
	17	+ PY_INCLUDES=""
	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
1311ddd6	21	+ for pyver in "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
1cd8df9f AF	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
	25	PY_INCLUDES="-I$dir"
	26	break
	27	fi
	28	done
	29	- else
	30	- PY_INCLUDES=""
	31	+ if test "x$PY_INCLUDES" != "x" ; then
	32	+ break
	33	+ fi
	34	+ done
	35	fi
	36	fi
	37
	38	@@ -61,8 +67,8 @@
	39	fi
	40
	41	else
	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"])
1311ddd6	44	+ for pyver in "" 2.6 2.5 2.4 2.3 2.2 2.1 2.0 ; do
1cd8df9f AF	45	+ AC_CHECK_LIB(python$pyver, PyArg_ParseTuple,[PYTHON_LIB="-lpython$pyver"])
	46	if test "x$PYTHON_LIB" != "x" ; then
	47	break
	48	fi
	49	@@ -374,9 +380,9 @@
	50	EOF
	51	AC_MSG_CHECKING([xslt compliance of $1])
	52	to_run=$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
	60	AC_MSG_RESULT([yes]);
	61	[$2]
	62	--- crossfire-1.9.1/check-fragment.am.wiget 2007-02-04 00:00:02.000000000 +0100
	63	+++ crossfire-1.9.1/check-fragment.am 2007-02-04 00:06:01.000000000 +0100
	64	@@ -16,8 +16,8 @@
	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 @@
	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 @@
	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";\
	102	$$torun; \
	103	fi; \
	104	@@ -65,8 +65,8 @@
	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";\
113	$$torun;
114	template-copy: $(LOGDIR)
115	@@ -79,7 +79,7 @@
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 @@
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";\
133	$$torun;
134
135	@@ -100,4 +100,4 @@
136	check-text: $(CHECK_TXT)
137	clean-unit:
138	rm -f autorun.xml
139	-noinst_PROGRAMS=$(TESTS)
140	\ Brak znaku nowej linii na końcu pliku
141	+noinst_PROGRAMS=$(TESTS)