- release 5

[packages/scribus.git] / scribus-python.patch

diff --git a/scribus-python.patch b/scribus-python.patch
index 5c28d8385f3434750e5fc0cc177b6e02fb8e47db..e52efcae10c5a5758e0895428a9aa1e779014155 100644 (file)
--- a/scribus-python.patch
+++ b/scribus-python.patch
@@ -1,25 +1,18 @@
---- scribus-1.1.2/acinclude.m4.orig    Tue Nov  4 11:26:22 2003
-+++ scribus-1.1.2/acinclude.m4 Tue Nov  4 11:43:45 2003
-@@ -3917,11 +3917,11 @@
+--- scribus-1.2.1/admin/acinclude.m4.in        2004-11-17 10:49:56.000000000 +0100
++++ scribus-1.2.1-patch/admin/acinclude.m4.in  2004-11-18 13:30:11.421704096 +0100
+@@ -4114,7 +4114,7 @@
+ 
  PYTHONINC=-I$python_incdir
  
- python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
--AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
--if test ! -r $python_libdir/libpython$version.a; then
--  AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir)
-+AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
-+if test ! -r $python_libdir/libpython$version.so; then
-+  AC_FIND_FILE(python$version/config/libpython$version.so, $python_libdirs, python_libdir)
-   python_libdir=$python_libdir/python$version/config
--  if test ! -r $python_libdir/libpython$version.a; then
-+  if test ! -r $python_libdir/libpython$version.so; then
-     python_libdir=no
-   fi
- fi
-@@ -3933,9 +3933,9 @@
+-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
++python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/share /usr/local /usr/lib64 /usr/lib$kdelibsuff $kde_extra_libs"
+ AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
+ if test ! -r $python_libdir/libpython$version.so; then
+   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
+@@ -4133,9 +4133,9 @@
+   LIBPYTHON=-lpython$version
  fi
  
- python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
 -AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
 +AC_FIND_FILE(python$version/copy.pyo, $python_libdirs, python_moddir)
  python_moddir=$python_moddir/python$version