--- configure.ac.old	2008-12-03 23:06:59.000000000 +0100
+++ configure.ac	2008-12-03 23:08:59.000000000 +0100
@@ -102,8 +102,12 @@
             [use_gucharmap=yes])
 if test x"$use_gucharmap" = "xyes"; then
   # Checks for gucharmap
-  PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= 1.4.0])
-  TOMOE_GTK_REQUIRED_LIBS="tomoe >= 0.4.0 gtk+-2.0 >= 2.4.0 gucharmap >= 1.4.0"
+  PKG_CHECK_MODULES(GUCHARMAP, [gucharmap-2 >= 1.4.0], [
+      TOMOE_GTK_REQUIRED_LIBS="tomoe >= 0.4.0 gtk+-2.0 >= 2.4.0 gucharmap-2 >= 1.4.0"
+    ],[
+      PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= 1.4.0], [
+          TOMOE_GTK_REQUIRED_LIBS="tomoe >= 0.4.0 gtk+-2.0 >= 2.4.0 gucharmap >= 1.4.0"])
+    ])
 else
   TOMOE_GTK_REQUIRED_LIBS="tomoe >= 0.4.0 gtk+-2.0 >= 2.4.0"
 fi