- do not associate any text format on this planet with abiword, especially

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

diff --git a/abiword-python24.patch b/abiword-python24.patch
index fb13a7ad121aded9e7751ea60992cad979f6fb12..030ac014c8e8c23ad11cb1bf95e8d5d59fc8b389 100644 (file)
--- a/abiword-python24.patch
+++ b/abiword-python24.patch
@@ -1,6 +1,6 @@
---- abiword-2.0.14/abiword-plugins/acinclude.m4.orig   2004-12-23 12:36:33.009389184 +0000
-+++ abiword-2.0.14/abiword-plugins/acinclude.m4        2004-12-23 12:37:29.448809088 +0000
-@@ -304,27 +304,27 @@
+--- 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.
  
@@ -11,29 +11,40 @@
                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
+--- 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>
+  
+  
+