File gdome2-0.8.1.diff of Package gdome2

Overview Repositories Revisions Requests Users Attributes Meta

File gdome2-0.8.1.diff of Package gdome2

--- configure.in.orig	2008-12-29 14:05:27.000000000 +0100
+++ configure.in	2008-12-29 14:05:42.000000000 +0100
@@ -59,23 +59,11 @@
 dnl
 
 GLIB_1="no"
-AC_ARG_ENABLE(glib-1, 
-        [  --enable-glib-1=[no]	            Specify if you want to use glib 1],
-	GLIB_1=yes
-)
 
-if test "x$GLIB_1" = "xyes"
-then
-	PKG_CHECK_MODULES(GLIB, glib)
-	GLIB_REQUIRED="glib"
-	GLIB_MIN_VERSION=1.2.10
-        AM_PATH_GLIB($GLIB_MIN_VERSION,,AC_MSG_ERROR(Could not find GLIB (see config.log for details).))
-else
 	PKG_CHECK_MODULES(GLIB, glib-2.0)
 	GLIB_REQUIRED="glib-2.0"
 	GLIB_MIN_VERSION=2.2.0
         AM_PATH_GLIB_2_0($GLIB_MIN_VERSION,,AC_MSG_ERROR(Could not find GLIB (see config.log for details).))
-fi
 AC_SUBST(GLIB_MIN_VERSION)
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_REQUIRED)
--- gdome-config.in.orig	2008-12-29 14:08:40.000000000 +0100
+++ gdome-config.in	2008-12-29 14:10:21.000000000 +0100
@@ -83,8 +83,8 @@
     shift
 done
 
-the_libs="$the_libs -L${exec_prefix}/lib -lgdome `@GLIB_CONFIG@ --libs` `@XML_CONFIG@ --libs`"
-the_flags="$the_flags -I${prefix}/include -I${prefix}/include/libgdome `@GLIB_CONFIG@ --cflags` `@XML_CONFIG@ --cflags`"
+the_libs="$the_libs -L${exec_prefix}/lib -lgdome `pkg-config --libs glib-2.0 libxml-2.0`"
+the_flags="$the_flags -I${prefix}/include -I${prefix}/include/libgdome `pkg-config --cflags glib-2.0 libxml-2.0`"
 
 if $cflags; then
     all_flags="$the_flags"

Places

File gdome2-0.8.1.diff of Package gdome2

Places