+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
( 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
MICRO_VERSION=2
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=68
+EXTRA_VERSION=69
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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
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. ],