1 --- 3store-2.2.22/configure.in.orig 2009-10-26 14:54:36.757604429 +0100
2 +++ 3store-2.2.22/configure.in 2009-10-26 15:02:47.223895797 +0100
4 if test "$MYSQL_CONFIG" = false; then
5 AC_MSG_ERROR([Can't find mysql_config - are MySQL and the development tools installed?])
7 -AC_PATH_PROG([GLIB_CONFIG], [glib-config], [false], [$PATH:/sbin:/usr/sbin:/usr/local/sbin])
8 -if test "$GLIB_CONFIG" = false; then
9 - AC_MSG_ERROR([Can't find glib-config - You need to install libglib (and appropriate -devel package if using packages)])
11 +PKG_CHECK_MODULES(GLIB, glib-2.0)
12 +GLIB_INCLUDEDIR=`pkg-config --cflags-only-I glib-2.0`
13 +AC_SUBST([GLIB_INCLUDEDIR])
14 AC_PATH_PROG([RAPTOR_CONFIG], [raptor-config], [false], [$PATH:/sbin:/usr/sbin:/usr/local/sbin])
15 if test "$RAPTOR_CONFIG" = false; then
16 AC_MSG_ERROR([Can't find raptor-config - You need to install libraptor 0.9.10+ from http://www.redland.opensource.ac.uk/raptor/])
21 -GLIB_LIBS=`$GLIB_CONFIG --libs`
22 -GLIB_CFLAGS=`$GLIB_CONFIG --cflags`
24 MYSQL_LIBS=`$MYSQL_CONFIG --libs`
25 MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags`
27 --- 3store-2.2.22/3store.pc.in.orig 2009-10-27 22:28:58.364827273 +0100
28 +++ 3store-2.2.22/3store.pc.in 2009-10-27 22:38:52.324005811 +0100
31 Description: A fast, persistant RDF knowledgebase
32 Libs: -L${libdir} -lrdfsql
33 -Cflags: -I${includedir}
34 +Cflags: -I${includedir} @GLIB_INCLUDEDIR@
35 --- 3store-2.2.22/3store-config.in.orig 2009-10-27 22:52:05.769474111 +0100
36 +++ 3store-2.2.22/3store-config.in 2009-10-27 22:52:56.765969239 +0100
40 if test @includedir@ != /usr/include ; then
41 - cflags=-I@includedir@
42 + cflags="-I@includedir@ @GLIB_INCLUDEDIR@"
45 + cflags="@GLIB_INCLUDEDIR@"
48 opts=`getopt -n 3store-config -a -u -l 'prefix,exec-prefix,bindir,libs,cflags,version,help' '' -- $*`