SOURCES: gedit2-libtool.patch - proper fix (thx qboosh)

[megabajt]

Author: megabajt                     Date: Wed May 28 16:02:17 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- proper fix (thx qboosh)

---- Files affected:
SOURCES:
   gedit2-libtool.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/gedit2-libtool.patch
diff -u SOURCES/gedit2-libtool.patch:1.1 SOURCES/gedit2-libtool.patch:1.2
--- SOURCES/gedit2-libtool.patch:1.1	Wed May 28 17:12:47 2008
+++ SOURCES/gedit2-libtool.patch	Wed May 28 18:02:11 2008
@@ -1,14 +1,12 @@
 diff -urN gedit-2.22.3/configure.ac gedit-2.22.3.new/configure.ac
 --- gedit-2.22.3/configure.ac	2008-05-27 14:05:34.000000000 +0200
-+++ gedit-2.22.3.new/configure.ac	2008-05-28 16:27:21.000000000 +0200
-@@ -232,8 +232,8 @@
- }
- EOF
++++ gedit-2.22.3.new/configure.ac	2008-05-28 17:58:51.000000000 +0200
+@@ -31,6 +31,8 @@
+ IT_PROG_INTLTOOL([0.35.0])
  
--	if /bin/sh ../libtool --mode=compile ${CC} $PYTHON_CFLAGS -c testpython.c >/dev/null 2>&1 && \
--		/bin/sh ../libtool --mode=link ${CC} -o testpython.la -rpath `pwd` -module -avoid-version -no-undefined $PYTHON_LIB_LOC testpython.lo $PYTHON_LIBS $PYTHON_EXTRA_LIBS >/dev/null 2>&1 && \
-+	if /bin/sh /usr/bin/libtool --tag=CC --mode=compile ${CC} $PYTHON_CFLAGS -c testpython.c >/dev/null 2>&1 && \
-+		/bin/sh /usr/bin/libtool --tag=CC --mode=link ${CC} -o testpython.la -rpath `pwd` -module -avoid-version -no-undefined $PYTHON_LIB_LOC testpython.lo $PYTHON_LIBS $PYTHON_EXTRA_LIBS >/dev/null 2>&1 && \
- 		grep 'dlname.*testpython' testpython.la >/dev/null 2>&1; then
- 		result=yes
- 	else
+ AC_PROG_LIBTOOL
++dnl when using libtool 2.x create libtool early, because it's used in configure
++m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+ 
+ GNOME_DOC_INIT
+ GTK_DOC_CHECK([1.0])
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/gedit2-libtool.patch?r1=1.1&r2=1.2&f=u