[evolution-patches] Test for libgnomecanvas/gtk2 compat
- From: Mike Kestner <mkestner ximian com>
- To: evolution-patches lists ximian com
- Subject: [evolution-patches] Test for libgnomecanvas/gtk2 compat
- Date: 12 May 2003 11:48:15 -0500
This adds a test to gal to require libgnomecanvas-2.2.0.2 if gtk-2.2 is
installed.
Mike
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gal/configure.in,v
retrieving revision 1.257
diff -u -p -r1.257 configure.in
--- configure.in 3 May 2003 17:05:26 -0000 1.257
+++ configure.in 12 May 2003 16:42:54 -0000
@@ -249,6 +249,8 @@ fi
AC_SUBST(HTML_DIR)
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
dnl
dnl For the various galConf.sh scripts generation.
dnl
@@ -263,6 +265,18 @@ AC_SUBST(GAL_LIBS)
PKG_CHECK_MODULES(EXTRA_GNOME, libgnomeprint-2.2 >= 2.2.0 libgnomeprintui-2.2 >= 2.2.1 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libxml-2.0)
AC_SUBST(EXTRA_GNOME_LIBS)
AC_SUBST(EXTRA_GNOME_CFLAGS)
+
+AC_MSG_CHECKING(libgnomecanvas and gtk2 compatibility)
+ if $PKG_CONFIG --atleast-version 2.2.0 gtk+-2.0 ; then
+ if $PKG_CONFIG --atleast-version 2.2.0.2 libgnomecanvas-2.0 ; then
+ AC_MSG_RESULT(okay)
+ else
+ AC_MSG_ERROR([*** libgnomecanvas-2.2.0.2 or newer is required with gtk-2.2. ])
+ fi
+ else
+ AC_MSG_RESULT(okay)
+ fi
+
CFLAGS="$CFLAGS -D_REENTRANT"
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/ChangeLog,v
retrieving revision 1.769
diff -u -p -r1.769 ChangeLog
--- ChangeLog 7 May 2003 17:57:14 -0000 1.769
+++ ChangeLog 12 May 2003 16:42:59 -0000
@@ -1,3 +1,7 @@
+2003-05-12 Mike Kestner <mkestner ximian com>
+
+ * configure.in : add gtk/libgnomecanvas compatability test
+
2003-05-07 Alastair Tse <liquidx gentoo org>
* docs/gal-api.sgml: formatting fixes.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]