packages: 3store/glib2.patch - 3store.pc and 3store-config should know abou...

[sls]

Author: sls                          Date: Tue Oct 27 22:08:53 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 3store.pc and 3store-config should know about glib-2.0 --cflags-only-I
  (or should it be full --cflags?)

---- Files affected:
packages/3store:
   glib2.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/3store/glib2.patch
diff -u packages/3store/glib2.patch:1.1 packages/3store/glib2.patch:1.2
--- packages/3store/glib2.patch:1.1	Mon Oct 26 15:44:47 2009
+++ packages/3store/glib2.patch	Tue Oct 27 23:08:48 2009
@@ -1,6 +1,6 @@
 --- 3store-2.2.22/configure.in.orig	2009-10-26 14:54:36.757604429 +0100
 +++ 3store-2.2.22/configure.in	2009-10-26 15:02:47.223895797 +0100
-@@ -45,10 +45,7 @@
+@@ -45,10 +45,9 @@
  if test "$MYSQL_CONFIG" = false; then
    AC_MSG_ERROR([Can't find mysql_config - are MySQL and the development tools installed?])
  fi
@@ -9,6 +9,8 @@
 -  AC_MSG_ERROR([Can't find glib-config - You need to install libglib (and appropriate -devel package if using packages)])
 -fi
 +PKG_CHECK_MODULES(GLIB, glib-2.0)
++GLIB_INCLUDEDIR=`pkg-config --cflags-only-I glib-2.0`
++AC_SUBST([GLIB_INCLUDEDIR])
  AC_PATH_PROG([RAPTOR_CONFIG], [raptor-config], [false], [$PATH:/sbin:/usr/sbin:/usr/local/sbin])
  if test "$RAPTOR_CONFIG" = false; then
    AC_MSG_ERROR([Can't find raptor-config - You need to install libraptor 0.9.10+ from http://www.redland.opensource.ac.uk/raptor/])
@@ -22,3 +24,25 @@
  MYSQL_LIBS=`$MYSQL_CONFIG --libs`
  MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags`
  
+--- 3store-2.2.22/3store.pc.in.orig	2009-10-27 22:28:58.364827273 +0100
++++ 3store-2.2.22/3store.pc.in	2009-10-27 22:38:52.324005811 +0100
+@@ -7,4 +7,4 @@
+ Version: @VERSION@
+ Description: A fast, persistant RDF knowledgebase
+ Libs: -L${libdir} -lrdfsql
+-Cflags: -I${includedir} 
++Cflags: -I${includedir} @GLIB_INCLUDEDIR@
+--- 3store-2.2.22/3store-config.in.orig	2009-10-27 22:52:05.769474111 +0100
++++ 3store-2.2.22/3store-config.in	2009-10-27 22:52:56.765969239 +0100
+@@ -29,9 +29,9 @@
+ version=@VERSION@
+ 
+ if test @includedir@ != /usr/include ; then
+-	cflags=-I at includedir@
++	cflags="-I at includedir@ @GLIB_INCLUDEDIR@"
+ else
+-	cflags=''
++	cflags="@GLIB_INCLUDEDIR@"
+ fi
+ 
+ opts=`getopt -n 3store-config -a -u -l 'prefix,exec-prefix,bindir,libs,cflags,version,help' '' -- $*`
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/3store/glib2.patch?r1=1.1&r2=1.2&f=u