summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-10-19 04:46:59 -0700
committerStefano Karapetsas <[email protected]>2013-10-19 04:46:59 -0700
commitd3178d6a81bb95316193d24926bed3fdc943355e (patch)
tree3b1c45b791d590e1f69f9d67e002cabcc68d6016 /configure.ac
parent3a822cb94c27a06bb72921edc1875689818ff0de (diff)
parent15a5d5502765bc1a593d833ca9f613e77dc70aa2 (diff)
downloadmate-applets-d3178d6a81bb95316193d24926bed3fdc943355e.tar.bz2
mate-applets-d3178d6a81bb95316193d24926bed3fdc943355e.tar.xz
Merge pull request #59 from infirit/master
Move to gucharmap + make distcheck now works
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac38
1 files changed, 19 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac
index 8e8788bb..510b19c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_INIT(mate-applets, 1.6.1)
AC_PREREQ(2.59)
AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE([1.9 tar-ustar])
+AM_INIT_AUTOMAKE([1.9 tar-ustar dist-xz no-dist-gz])
AC_CONFIG_MACRO_DIR(m4)
dnl ***************************************************************************
@@ -28,8 +28,8 @@ PYGTK_REQUIRED=2.6
PYGOBJECT_REQUIRED=2.6
MATE_ICON_THEME_REQUIRED=1.1.0
LIBXML_REQUIRED=2.5.0
-MUCHARMAP2_REQUIRED=1.5.0
-MUCHARMAP_REQUIRED=1.4.0
+GUCHARMAP2_REQUIRED=2.33.0
+GUCHARMAP_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 mucharmap (optional) -----------------------------------------
+dnl -- check for gucharmap (optional) -----------------------------------------
-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])
+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])
else
- PKG_CHECK_MODULES([MUCHARMAP], [mucharmap >= $MUCHARMAP_REQUIRED],
- [have_mucharmap=yes],[have_mucharmap=no])
+ PKG_CHECK_MODULES([GUCHARMAP], [gucharmap >= $GUCHARMAP_REQUIRED],
+ [have_gucharmap=yes],[have_gucharmap=no])
fi
-if test "$have_mucharmap_2" = "yes"; then
- AC_DEFINE([HAVE_MUCHARMAP_2],[1],[Define if mucharmap API is version 2])
+if test "$have_gucharmap_2" = "yes"; then
+ AC_DEFINE([HAVE_GUCHARMAP_2],[1],[Define if gucharmap API is version 2])
fi
-if test "$have_mucharmap" = "yes"; then
- AC_DEFINE([HAVE_MUCHARMAP],[1],[Mucharmap Available])
+if test "$have_gucharmap" = "yes"; then
+ AC_DEFINE([HAVE_GUCHARMAP],[1],[Gucharmap Available])
else
- AC_MSG_WARN([*** 'charpick' applet will not be built with mucharmap support ***])
+ AC_MSG_WARN([*** 'charpick' applet will not be built with gucharmap support ***])
fi
-AC_SUBST(MUCHARMAP_CFLAGS)
-AC_SUBST(MUCHARMAP_LIBS)
+AC_SUBST(GUCHARMAP_CFLAGS)
+AC_SUBST(GUCHARMAP_LIBS)
dnl -- check for Python modules (optional) ------------------------------
PYGTK_CFLAGS=
@@ -713,8 +713,8 @@ mate-applets-$VERSION configure summary:
- accessx-status $HAVE_XKB
- battstat $build_battstat_applet
- charpick always
- - mucharmap support $have_mucharmap
- - mucharmap-2 support $have_mucharmap_2
+ - gucharmap support $have_gucharmap
+ - gucharmap-2 support $have_gucharmap_2
- cpufreq $build_cpufreq_applet
- building selector $enable_selector
- using PolicyKit $HAVE_POLKIT