gnome-applets r10791 - trunk

[callum svn gnome org]

Author: callum
Date: Sun Apr 13 00:29:14 2008
New Revision: 10791
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=10791&view=rev

Log:
Prepare for a gucharmap API change.

Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Apr 13 00:29:14 2008
@@ -36,6 +36,8 @@
 GNOME_ICON_THEME_REQUIRED=2.15.91
 LIBXML_REQUIRED=2.5.0
 GWEATHER_REQUIRED=2.22.1
+GUCHARMAP2_REQUIRED=2.21.5
+GUCHARMAP_REQUIRED=1.4.0
 dnl ***************************************************************************
 
 AM_MAINTAINER_MODE
@@ -242,13 +244,19 @@
 AC_SUBST(HAL_LIBS)
 
 dnl -- check for gucharmap (optional) -----------------------------------------
-GUCHARMAP_CFLAGS=
-GUCHARMAP_LIBS=
-PKG_CHECK_MODULES(GUCHARMAP, gucharmap >= 1.4.0,
-		  HAVE_GUCHARMAP="yes", HAVE_GUCHARMAP="no")
 
-if test "x$HAVE_GUCHARMAP" = "xyes"; then
-	AC_DEFINE(HAVE_GUCHARMAP, 1, [Gucharmap Available])
+PKG_CHECK_MODULES([GUCHARMAP2],[gucharmap-2 >= $GUCHARMAP2_REQUIRED],
+                  [have_gucharmap=yes have_gucharmap_2=yes],[have_gucharmap_2=no])
+if test "$have_gucharmap_2" = "no"; then
+      PKG_CHECK_MODULES([GUCHARMAP], [gucharmap >= $GUCHARMAP_REQUIRED],
+                        [have_gucharmap=yes],[have_gucharmap=no])
+fi
+
+if test "$have_gucharmap_2" = "yes"; then
+        AC_DEFINE([HAVE_GUCHARMAP_2],[1],[Define if gucharmap API is version 2])
+fi
+if test "$have_gucharmap" = "yes"; then
+	AC_DEFINE([HAVE_GUCHARMAP],[1],[Gucharmap Available])
 else
   AC_MSG_WARN([*** 'charpick' applet will not be built with gucharmap support ***])
 fi