From 49d78bf288b7f961399d6609d14b54671484c7f9 Mon Sep 17 00:00:00 2001
From: saq <saq@pld-linux.org>
Date: Sun, 2 Jan 2005 16:17:17 +0000
Subject: [PATCH] - modified to support both 2.3 and 2.4 at the time

Changed files:
    abiword-python24.patch -> 1.3
---
 abiword-python24.patch | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/abiword-python24.patch b/abiword-python24.patch
index cf5d760..030ac01 100644
--- a/abiword-python24.patch
+++ b/abiword-python24.patch
@@ -11,29 +11,29 @@
  		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"
++		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"
++		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"
-+		CPPFLAGS="$CPPFLAGS -I/usr/include/python2.4"
++		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"
-+	CPPFLAGS="$CPPFLAGS -I/usr/include/python2.4"
++],[	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(python2.4,Py_Initialize,[
-+			ABI_GYPSY_LDFLAGS="$ABI_GYPSY_LDFLAGS -lpython2.4"
++		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
@@ -44,7 +44,7 @@
  #include "xap_Frame.h"
  
 -#include <python2.3/Python.h>
-+#include <python2.4/Python.h>
++#include <Python.h>
   
   
   
-- 
2.44.0