From ba7f835eb79762dd65356a0722aa3e64ad03decb Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Sat, 24 Nov 2012 18:27:43 +0100 Subject: update configure --- configure.in | 67 ++++++++++++------------------------------------------------ 1 file changed, 13 insertions(+), 54 deletions(-) diff --git a/configure.in b/configure.in index 47732715..f41a5e1e 100644 --- a/configure.in +++ b/configure.in @@ -14,10 +14,7 @@ dnl *************************************************************************** GTK_REQUIRED=2.20.0 GLIB_REQUIRED=2.22.0 GIO_REQUIRED=2.15.3 -MATECONF_REQUIRED=1.1.0 -SCROLLKEEPER_REQUIRED=0.1.4 -LIBPANEL_REQUIRED=1.1.0 -LIBPANEL3_REQUIRED=1.1.0 +LIBPANEL4_REQUIRED=1.5.2 LIBGTOP_REQUIRED=2.11.92 LIBXKLAVIER_REQUIRED=4.0 LIBMATEWNCK_REQUIRED=1.3.0 @@ -29,7 +26,6 @@ DBUS_REQUIRED=1.1.2 DBUS_GLIB_REQUIRED=0.74 PYGTK_REQUIRED=2.6 PYGOBJECT_REQUIRED=2.6 -MATE_PYTHON_REQUIRED=1.1.0 MATE_ICON_THEME_REQUIRED=1.1.0 LIBXML_REQUIRED=2.5.0 GUCHARMAP2_REQUIRED=2.23.0 @@ -116,15 +112,10 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) AC_SUBST(GTK_FLAGS) AC_SUBST(GTK_LIBS) -dnl -- check for libmatepanelapplet (required) ------------------------------------ -PKG_CHECK_MODULES(MATE_APPLETS, libmatepanelapplet-2.0 >= $LIBPANEL_REQUIRED) -AC_SUBST(MATE_APPLETS_CFLAGS) -AC_SUBST(MATE_APPLETS_LIBS) - -dnl -- check for libmatepanelapplet3 (required) ------------------------------------ -PKG_CHECK_MODULES(MATE_APPLETS3, libmatepanelapplet-3.0 >= $LIBPANEL3_REQUIRED) -AC_SUBST(MATE_APPLETS3_CFLAGS) -AC_SUBST(MATE_APPLETS3_LIBS) +dnl -- check for libmatepanelapplet4 (required) ------------------------------------ +PKG_CHECK_MODULES(MATE_APPLETS4, libmatepanelapplet-4.0 >= $LIBPANEL4_REQUIRED) +AC_SUBST(MATE_APPLETS4_CFLAGS) +AC_SUBST(MATE_APPLETS4_LIBS) dnl -- check for mate-desktop (required) ------------------------------------- PKG_CHECK_MODULES(MATEDESKTOP, mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED) @@ -270,13 +261,12 @@ fi AC_SUBST(GUCHARMAP_CFLAGS) AC_SUBST(GUCHARMAP_LIBS) -dnl -- check for Python/MATE modules (optional) ------------------------------ +dnl -- check for Python modules (optional) ------------------------------ PYGTK_CFLAGS= PYGTK_LIBS= PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= $PYGTK_REQUIRED - pygobject-2.0 >= $PYGOBJECT_REQUIRED - mate-python-2.0 >= $MATE_PYTHON_REQUIRED, + pygobject-2.0 >= $PYGOBJECT_REQUIRED, HAVE_PYGTK="yes", HAVE_PYGTK="no") AC_SUBST(PYGTK_LIBS) AC_SUBST(PYGTK_CFLAGS) @@ -288,7 +278,7 @@ AC_SUBST(XML2_LIBS) dnl -- check for libmateweather (required for mateweather applet) ------------------ build_libmateweather_applets=false -PKG_CHECK_MODULES(LIBMATEWEATHER, mateweather, +PKG_CHECK_MODULES(LIBMATEWEATHER, mateweather >= 1.5.0, build_libmateweather_applets=true, AC_MSG_WARN([libmateweather not found. Not building the weather applet.])) AC_SUBST(LIBMATEWEATHER_CFLAGS) @@ -351,25 +341,12 @@ AC_SUBST(GDK_PIXBUF_CSOURCE) dnl -- glib-genmarshal -------------------------------------------------------- AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) -dnl -- mateconftool-2 ------------------------------------------------------------ -AC_PATH_PROG(MATECONFTOOL, mateconftool-2, no) -if test x"$MATECONFTOOL" = xno; then - AC_MSG_ERROR([mateconftool-2 executable not found in your path - should be installed with MateConf]) -fi - dnl -- xsltproc --------------------------------------------------------------- AC_PATH_PROG(XSLTPROC, xsltproc, no) if test x"$XSLTPROC" = xno; then AC_MSG_ERROR([xsltproc executable not found in your path - should be installed with libxslt]) fi -dnl -- scrollkeeper ----------------------------------------------------------- -AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config, no) -if test x$SCROLLKEEPER_CONFIG = xno; then - AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the Scrollkeeper 0.1.4 package) -fi -AC_SUBST(SCROLLKEEPER_REQUIRED) - dnl -- jw --------------------------------------------------------------------- AC_PATH_PROG(JW, jw, no) if test x$JW = xno; then @@ -381,9 +358,9 @@ AM_CONDITIONAL(HAVE_JW, test "x$HAVE_JW" = "xyes") AC_SUBST(HAVE_JW) dnl *************************************************************************** -dnl *** MateConf *** +dnl *** GSettings *** dnl *************************************************************************** -AM_MATECONF_SOURCE_2 +GLIB_GSETTINGS dnl *************************************************************************** dnl *** Set up gettext *** @@ -411,7 +388,7 @@ dnl *************************************************************************** dnl --disable-battstat=(yes|no) AC_ARG_ENABLE(battstat, [ --disable-battstat=[@<:@no/yes@:>@] - don't build battery monitor applet [@<:@default: no@:>@]],, + dont build battery monitor applet [@<:@default: no@:>@]],, disable_battstat=no) HAVE_LIBAPM=no @@ -462,13 +439,6 @@ AM_CONDITIONAL(HAVE_LIBAPM, test "x$HAVE_LIBAPM" = "xyes") AM_CONDITIONAL(NEED_LIBAPM, test "x$NEED_LIBAPM" = "xyes") AM_CONDITIONAL(BUILD_BATTSTAT_APPLET, test x$build_battstat_applet = xyes) -dnl *************************************************************************** -dnl *** Mini-Commander specific checks *** -dnl *************************************************************************** -AC_ARG_ENABLE(mini-commander, [ --enable-mini-commander build mini-commander - [@<:@default: no, transparent upgrade to deskbar-applet@:>@]], enable_mini_commander="yes", enable_mini_commander="no") -AM_CONDITIONAL(BUILD_MINICOMMANDER_APPLET, test "x$enable_mini_commander" = "xyes") - dnl *************************************************************************** dnl *** Stickynotes specific checks *** dnl *************************************************************************** @@ -535,7 +505,7 @@ dnl *************************************************************************** dnl --disable-cpufreq=(yes|no) AC_ARG_ENABLE(cpufreq, [ --disable-cpufreq[@<:@=no/yes@:>@] - don't build cpu frequency scaling monitor applet + dont build cpu frequency scaling monitor applet [@<:@default: no@:>@]],, disable_cpufreq=no) @@ -586,14 +556,7 @@ dnl *************************************************************************** dnl *** invest-applet specific checks *** dnl *************************************************************************** -if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then - AM_CHECK_PYMOD(mateapplet,, - BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no") -else - BUILD_INVEST_APPLET="no" -fi - -AM_CONDITIONAL(BUILD_INVEST_APPLET, test "x$BUILD_INVEST_APPLET" = "xyes") +AM_CONDITIONAL(BUILD_INVEST_APPLET, test "x$HAVE_PYGTK" = "xyes") dnl *************************************************************************** dnl *** Check if IPv6 is available *** @@ -709,9 +672,6 @@ po/Makefile.in accessx-status/Makefile accessx-status/docs/Makefile accessx-status/pixmaps/Makefile -mini-commander/Makefile -mini-commander/src/Makefile -mini-commander/help/Makefile drivemount/Makefile drivemount/help/Makefile modemlights/Makefile @@ -784,7 +744,6 @@ mate-applets-$VERSION configure summary: - geyes always - mateweather $build_libmateweather_applets - invest-applet $BUILD_INVEST_APPLET - - mini-commander $enable_mini_commander - modemlights $BUILD_MODEM_LIGHTS - mixer $enable_mixer - multiload $build_gtop_applets -- cgit v1.2.1