glib2.patch

   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
   3 @@ -45,10 +45,9 @@
   4  if test "$MYSQL_CONFIG" = false; then
   5    AC_MSG_ERROR([Can't find mysql_config - are MySQL and the development tools installed?])
   6  fi
   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)])
  10 -fi
  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/])
  17 @@ -72,9 +69,6 @@
  18  AC_C_INLINE
  19  AC_C_BIGENDIAN
  20
  21 -GLIB_LIBS=`$GLIB_CONFIG --libs`
  22 -GLIB_CFLAGS=`$GLIB_CONFIG --cflags`
  23 -
  24  MYSQL_LIBS=`$MYSQL_CONFIG --libs`
  25  MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags`
  26
  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
  29 @@ -7,4 +7,4 @@
  30  Version: @VERSION@
  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
  37 @@ -29,9 +29,9 @@
  38  version=@VERSION@
  39
  40  if test @includedir@ != /usr/include ; then
  41 -       cflags=-I@includedir@
  42 +       cflags="-I@includedir@ @GLIB_INCLUDEDIR@"
  43  else
  44 -       cflags=''
  45 +       cflags="@GLIB_INCLUDEDIR@"
  46  fi
  47
  48  opts=`getopt -n 3store-config -a -u -l 'prefix,exec-prefix,bindir,libs,cflags,version,help' '' -- $*`