summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-01-29 02:40:43 -0800
committerStefano Karapetsas <[email protected]>2013-01-29 02:40:43 -0800
commit205530f345e20850f814111399d89cd94daa6f36 (patch)
treec918bd0ff1292cfb03a883c2656c68ca9a53a955 /configure.in
parentad73fd8ef318fa8edd37fd949330e9173e089af2 (diff)
parent79c1485d955e32a1d2fc64e96f8b342c76be3f4f (diff)
downloadmate-applets-205530f345e20850f814111399d89cd94daa6f36.tar.bz2
mate-applets-205530f345e20850f814111399d89cd94daa6f36.tar.xz
Merge pull request #30 from NiceandGently/master
build charpic applet against mate-character-map
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in36
1 files changed, 18 insertions, 18 deletions
diff --git a/configure.in b/configure.in
index 5f680723..d586192e 100644
--- a/configure.in
+++ b/configure.in
@@ -28,8 +28,8 @@ PYGTK_REQUIRED=2.6
PYGOBJECT_REQUIRED=2.6
MATE_ICON_THEME_REQUIRED=1.1.0
LIBXML_REQUIRED=2.5.0
-GUCHARMAP2_REQUIRED=2.23.0
-GUCHARMAP_REQUIRED=1.4.0
+MUCHARMAP2_REQUIRED=1.5.0
+MUCHARMAP_REQUIRED=1.4.0
POLKIT_REQUIRED=0.92
NETWORKMANAGER_REQUIRED=0.7
dnl ***************************************************************************
@@ -238,27 +238,27 @@ fi
AC_SUBST(UPOWER_CFLAGS)
AC_SUBST(UPOWER_LIBS)
-dnl -- check for gucharmap (optional) -----------------------------------------
+dnl -- check for mucharmap (optional) -----------------------------------------
-PKG_CHECK_EXISTS([gucharmap-2 >= $GUCHARMAP2_REQUIRED],
- [have_gucharmap=yes have_gucharmap_2=yes],[have_gucharmap_2=no])
-if test "$have_gucharmap_2" = "yes"; then
- PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2 >= $GUCHARMAP2_REQUIRED])
+PKG_CHECK_EXISTS([mucharmap-2 >= $MUCHARMAP2_REQUIRED],
+ [have_mucharmap=yes have_mucharmap_2=yes],[have_mucharmap_2=no])
+if test "$have_mucharmap_2" = "yes"; then
+ PKG_CHECK_MODULES([MUCHARMAP],[mucharmap-2 >= $MUCHARMAP2_REQUIRED])
else
- PKG_CHECK_MODULES([GUCHARMAP], [gucharmap >= $GUCHARMAP_REQUIRED],
- [have_gucharmap=yes],[have_gucharmap=no])
+ PKG_CHECK_MODULES([MUCHARMAP], [mucharmap >= $MUCHARMAP_REQUIRED],
+ [have_mucharmap=yes],[have_mucharmap=no])
fi
-if test "$have_gucharmap_2" = "yes"; then
- AC_DEFINE([HAVE_GUCHARMAP_2],[1],[Define if gucharmap API is version 2])
+if test "$have_mucharmap_2" = "yes"; then
+ AC_DEFINE([HAVE_MUCHARMAP_2],[1],[Define if mucharmap API is version 2])
fi
-if test "$have_gucharmap" = "yes"; then
- AC_DEFINE([HAVE_GUCHARMAP],[1],[Gucharmap Available])
+if test "$have_mucharmap" = "yes"; then
+ AC_DEFINE([HAVE_MUCHARMAP],[1],[Mucharmap Available])
else
- AC_MSG_WARN([*** 'charpick' applet will not be built with gucharmap support ***])
+ AC_MSG_WARN([*** 'charpick' applet will not be built with mucharmap support ***])
fi
-AC_SUBST(GUCHARMAP_CFLAGS)
-AC_SUBST(GUCHARMAP_LIBS)
+AC_SUBST(MUCHARMAP_CFLAGS)
+AC_SUBST(MUCHARMAP_LIBS)
dnl -- check for Python modules (optional) ------------------------------
PYGTK_CFLAGS=
@@ -714,8 +714,8 @@ mate-applets-$VERSION configure summary:
- accessx-status $HAVE_XKB
- battstat $build_battstat_applet
- charpick always
- - gucharmap support $have_gucharmap
- - gucharmap-2 support $have_gucharmap_2
+ - mucharmap support $have_mucharmap
+ - mucharmap-2 support $have_mucharmap_2
- cpufreq $build_cpufreq_applet
- building selector $enable_selector
- using PolicyKit $HAVE_POLKIT