[packages/abiword.git] / abiword-python24.patch

--- abiword-2.0.14/abiword-plugins/tools/gypsython/plugin.m4.orig	2004-12-23 14:01:57.074696040 +0100
+++ abiword-2.0.14/abiword-plugins/tools/gypsython/plugin.m4	2004-12-23 14:02:20.946626000 +0100
@@ -28,27 +28,27 @@
 # Checks for libraries.
 # Checks for header files.
 
-AC_ARG_WITH(python,[  --with-python=DIR        Python 2.3 library in DIR],[
+AC_ARG_WITH(python,[  --with-python=DIR        Python 2.4 library in DIR],[
 	if test "x$withval" = "xno"; then
 		ABI_PLUGIN_REPORT([gypsython: Python support disabled])
 		abi_plugin_disable=yes
 	elif test "x$withval" != "xyes"; then
-		ABI_GYPSY_CPPFLAGS="-I$withval/include/python2.3"
+		ABI_GYPSY_CPPFLAGS="-I$withval/include/python2.4 -I$withval/include/python2.3"
 		ABI_GYPSY_LDFLAGS="-L$withval/lib"
-		CPPFLAGS="$CPPFLAGS -I$withval/include/python2.3"
+		CPPFLAGS="$CPPFLAGS -I$withval/include/python2.4 -I$withval/include/python2.3"
 		LDFLAGS="$LDFLAGS -L$withval/lib"
 	else
-		ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.3"
-		CPPFLAGS="$CPPFLAGS -I/usr/include/python2.3"
+		ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.4 -I/usr/include/python2.3"
+		CPPFLAGS="$CPPFLAGS -I/usr/include/python2.4 -I/usr/include/python2.3"
 	fi
-],[	ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.3"
-	CPPFLAGS="$CPPFLAGS -I/usr/include/python2.3"
+],[	ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.4 -I/usr/include/python2.3"
+	CPPFLAGS="$CPPFLAGS -I/usr/include/python2.4 -I/usr/include/python2.3"
 ])
 
 if test $abi_plugin_disable != yes; then
 	AC_CHECK_HEADER(Python.h,[
-		AC_CHECK_LIB(python2.3,Py_Initialize,[
-			ABI_GYPSY_LDFLAGS="$ABI_GYPSY_LDFLAGS -lpython2.3"
+		AC_CHECK_LIB(python,Py_Initialize,[
+			ABI_GYPSY_LDFLAGS="$ABI_GYPSY_LDFLAGS -lpython"
 			ABI_PLUGIN_REPORT([gypsython: okay])
 		],[	ABI_PLUGIN_REPORT([gypsython: error - Python library not found])
 			abi_plugin_disable=yes
--- abiword-2.0.14/abiword-plugins/tools/gypsython/xp/Gypsython.h.orig	2004-12-23 14:10:50.111645632 +0100
+++ abiword-2.0.14/abiword-plugins/tools/gypsython/xp/Gypsython.h	2004-12-23 14:11:02.641740768 +0100
@@ -37,7 +37,7 @@
 #include "xap_Dlg_Language.h"
 #include "xap_Frame.h"
 
-#include <python2.3/Python.h>
+#include <Python.h>
Commit	Line	Data
7aef1052	1	--- abiword-2.0.14/abiword-plugins/tools/gypsython/plugin.m4.orig 2004-12-23 14:01:57.074696040 +0100
	2	+++ abiword-2.0.14/abiword-plugins/tools/gypsython/plugin.m4 2004-12-23 14:02:20.946626000 +0100
	3	@@ -28,27 +28,27 @@
9a3b65ac	4	# Checks for libraries.
	5	# Checks for header files.
	6
	7	-AC_ARG_WITH(python,[ --with-python=DIR Python 2.3 library in DIR],[
	8	+AC_ARG_WITH(python,[ --with-python=DIR Python 2.4 library in DIR],[
	9	if test "x$withval" = "xno"; then
	10	ABI_PLUGIN_REPORT([gypsython: Python support disabled])
	11	abi_plugin_disable=yes
	12	elif test "x$withval" != "xyes"; then
	13	- ABI_GYPSY_CPPFLAGS="-I$withval/include/python2.3"
49d78bf2	14	+ ABI_GYPSY_CPPFLAGS="-I$withval/include/python2.4 -I$withval/include/python2.3"
9a3b65ac	15	ABI_GYPSY_LDFLAGS="-L$withval/lib"
9a3b65ac	16	- CPPFLAGS="$CPPFLAGS -I$withval/include/python2.3"
49d78bf2	17	+ CPPFLAGS="$CPPFLAGS -I$withval/include/python2.4 -I$withval/include/python2.3"
9a3b65ac	18	LDFLAGS="$LDFLAGS -L$withval/lib"
	19	else
	20	- ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.3"
	21	- CPPFLAGS="$CPPFLAGS -I/usr/include/python2.3"
49d78bf2	22	+ ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.4 -I/usr/include/python2.3"
49d78bf2	23	+ CPPFLAGS="$CPPFLAGS -I/usr/include/python2.4 -I/usr/include/python2.3"
9a3b65ac	24	fi
	25	-],[ ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.3"
	26	- CPPFLAGS="$CPPFLAGS -I/usr/include/python2.3"
49d78bf2	27	+],[ ABI_GYPSY_CPPFLAGS="-I/usr/include/python2.4 -I/usr/include/python2.3"
49d78bf2	28	+ CPPFLAGS="$CPPFLAGS -I/usr/include/python2.4 -I/usr/include/python2.3"
9a3b65ac	29	])
	30
	31	if test $abi_plugin_disable != yes; then
	32	AC_CHECK_HEADER(Python.h,[
	33	- AC_CHECK_LIB(python2.3,Py_Initialize,[
	34	- ABI_GYPSY_LDFLAGS="$ABI_GYPSY_LDFLAGS -lpython2.3"
49d78bf2	35	+ AC_CHECK_LIB(python,Py_Initialize,[
49d78bf2	36	+ ABI_GYPSY_LDFLAGS="$ABI_GYPSY_LDFLAGS -lpython"
9a3b65ac	37	ABI_PLUGIN_REPORT([gypsython: okay])
	38	],[ ABI_PLUGIN_REPORT([gypsython: error - Python library not found])
	39	abi_plugin_disable=yes
7aef1052	40	--- abiword-2.0.14/abiword-plugins/tools/gypsython/xp/Gypsython.h.orig 2004-12-23 14:10:50.111645632 +0100
	41	+++ abiword-2.0.14/abiword-plugins/tools/gypsython/xp/Gypsython.h 2004-12-23 14:11:02.641740768 +0100
	42	@@ -37,7 +37,7 @@
	43	#include "xap_Dlg_Language.h"
	44	#include "xap_Frame.h"
	45
	46	-#include <python2.3/Python.h>
49d78bf2	47	+#include <Python.h>
7aef1052	48
	49
	50