SOURCES: qof-link.patch - previous one obsolete, now fixes for 0.7.5

[qboosh]

Author: qboosh                       Date: Fri May 30 22:16:34 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- previous one obsolete, now fixes for 0.7.5

---- Files affected:
SOURCES:
   qof-link.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/qof-link.patch
diff -u SOURCES/qof-link.patch:1.3 SOURCES/qof-link.patch:1.4
--- SOURCES/qof-link.patch:1.3	Sat Sep  8 11:50:33 2007
+++ SOURCES/qof-link.patch	Sat May 31 00:16:28 2008
@@ -1,32 +1,22 @@
---- qof-0.6.1/lib/libsql/Makefile.am.orig	2005-12-28 18:10:23.000000000 +0100
-+++ qof-0.6.1/lib/libsql/Makefile.am	2006-02-21 23:15:37.501079250 +0100
+--- qof-0.7.5/configure.in.orig	2008-05-30 23:35:01.663046372 +0200
++++ qof-0.7.5/configure.in	2008-05-30 23:34:43.125992519 +0200
+@@ -264,7 +264,7 @@
+ fi
+ if test "x$LIBGDA_CFLAGS" = x; then
+     AC_MSG_RESULT([GDA not found (or disabled); will build using internal SQL library.])
+-    SQL_PKG_LIB="-lqofsql"
++    SQL_PKG_LIB="\$(top_builddir)/lib/libsql/libqofsql.la"
+ else
+     AC_ARG_ENABLE(gdabackend,
+       [  --enable-gdabackend     Enable the use of the gda backend (off).],
+--- qof-0.7.5/qof/Makefile.am.orig	2008-01-14 20:50:54.000000000 +0100
++++ qof-0.7.5/qof/Makefile.am	2008-05-30 23:33:57.747405703 +0200
 @@ -3,7 +3,7 @@
- lib_LTLIBRARIES = libqofsql.la
+ lib_LTLIBRARIES = libqof.la
  
- libqofsql_la_LDFLAGS= -version-info $(LIBQOFSQL_LIBRARY_VERSION) 
--
-+libqofsql_la_LIBADD = @GLIB_LIBS@
- libqofsql_la_SOURCES = \
- 	parser.c \
- 	parser.h \
---- qof-0.6.2/qof/Makefile.am.orig	2006-02-21 00:35:15.000000000 +0100
-+++ qof-0.6.2/qof/Makefile.am	2006-03-02 15:48:46.000000000 +0100
-@@ -91,15 +91,17 @@
- INCLUDES = \
-   -DPREFIX=\""$(prefix)"\"  \
-   -DDATADIR=\""$(datadir)"\"
-+SQLLIB=$(LIBGDA_LIBS) -lgdasql
- else
- INCLUDES = \
-   -I${top_srcdir}/lib/libsql  \
-   -DPREFIX=\""$(prefix)"\" \
-   -DDATADIR=\""$(datadir)"\"
-+SQLLIB=$(top_builddir)/lib/libsql/libqofsql.la
- endif
+ libqof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION) \
+-  $(LINKER_SCRIPT) -L${top_srcdir}/lib/libsql
++  $(LINKER_SCRIPT)
  
- libqof_la_LIBADD = \
--  ${LIBGDA_LIBS} \
-+  $(SQLLIB) \
-   ${GMODULE_LIBS} \
-   ${GOBJECT_LIBS} \
-   ${GLIB_LIBS} \
+ libqof_la_SOURCES =  \
+    qoflog.c \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/qof-link.patch?r1=1.3&r2=1.4&f=u