2007-06-18 [paul] 2.9.2cvs69

	* configure.ac
		use pkgconfig to check for gtk and glib

diff --git a/ChangeLog b/ChangeLog
index fe6340ec8d1cdf5d2489aa8d2e59f9c28ce9cc14..83dfb8085df802ef892238c45c817475325a3840 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-18 [paul]      2.9.2cvs69
+
+       * configure.ac
+               use pkgconfig to check for gtk and glib
+
 2007-06-17 [wwp]       2.9.2cvs68
 
        * src/ldif.c

diff --git a/PATCHSETS b/PATCHSETS
index a10ea9453d10da56e9891ecb97176f46f6b3de82..a627c5b4d5374eaa41970e17d5b68cc653950862 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2644,3 +2644,4 @@
 ( cvs diff -u -r 1.17.2.34 -r 1.17.2.35 src/alertpanel.c;  ) > 2.9.2cvs66.patchset
 ( cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/prefs_summaries.c;  cvs diff -u -r 1.150.2.97 -r 1.150.2.98 src/procmsg.c;  ) > 2.9.2cvs67.patchset
 ( cvs diff -u -r 1.12.2.12 -r 1.12.2.13 src/ldif.c;  cvs diff -u -r 1.14.2.13 -r 1.14.2.14 src/importldif.c;  ) > 2.9.2cvs68.patchset
+( cvs diff -u -r 1.654.2.2699 -r 1.654.2.2700 configure.ac;  ) > 2.9.2cvs69.patchset

diff --git a/configure.ac b/configure.ac
index 77bd79f836959983dc4e811d41ae554d5da7da92..bbf3397dee1dcac9b508fb9b9028c53d254fa308 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=68
+EXTRA_VERSION=69
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -310,9 +310,13 @@ dnl ** common code **
 dnl *****************
 
 dnl check for glib
-AM_PATH_GLIB_2_0(2.6.0,,
-       AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.),
-       gmodule gobject gthread)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6 gmodule-2.0 >= 2.6 gobject-2.0 >= 2.6 gthread-2.0 >= 2.6)
+      
+GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+AC_SUBST(GLIB_GENMARSHAL)
+
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
 
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
 syl_save_LIBS=$LIBS
@@ -400,8 +404,7 @@ dnl ** GTK user interface **
 dnl ************************
 
 dnl Checks for GTK
-AM_PATH_GTK_2_0(2.6.0,,
-       AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.))
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
 
 dnl --disable-deprecated switch for GTK2 purification
 AC_ARG_ENABLE(deprecated, [  --disable-deprecated  Disable deprecated GTK functions. ],