diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index 35869f8..cfabdd7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.53) -AC_INIT([mate-indicator-applet], [1.23.0],[https://github.com/mate-desktop/mate-indicator-applet/issues]) +AC_INIT([mate-indicator-applet], [1.28.0],[https://github.com/mate-desktop/mate-indicator-applet/issues]) AC_CONFIG_SRCDIR(src/applet-main.c) AM_CONFIG_HEADER(config.h) @@ -9,7 +9,6 @@ AM_INIT_AUTOMAKE([no-dist-gzip dist-xz check-news]) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) -IT_PROG_INTLTOOL([0.35.0]) AC_PROG_CC AM_PROG_CC_C_O AC_STDC_HEADERS @@ -20,6 +19,8 @@ AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +MATE_COMPILE_WARNINGS + ########################### # Dependencies ########################### @@ -83,7 +84,7 @@ PKG_CHECK_EXISTS(indicator3-0.4 >= $UBUNTU_INDICATOR_NG_VERSION, ### decide on what Indicators implementation to use... -if test "x$have_ayatanaindicator" == "xyes" && +if test "x$have_ayatanaindicator" = "xyes" && test "x$have_ubuntuindicator" != "xyes" && test "x$with_ubuntu_indicators" != "xyes"; then @@ -91,7 +92,7 @@ if test "x$have_ayatanaindicator" == "xyes" && use_ayatanaindicator="yes"; indicator_enforced="no"; -elif test "x$have_ubuntuindicator" == "xyes" && +elif test "x$have_ubuntuindicator" = "xyes" && test "x$have_ayatanaindicator" != "xyes" && test "x$with_ayatana_indicators" != "xyes"; then @@ -99,31 +100,31 @@ elif test "x$have_ubuntuindicator" == "xyes" && use_ubuntuindicator="yes"; indicator_enforced="no"; -elif test "x$have_ubuntuindicator" == "xyes" && - test "x$have_ayatanaindicator" == "xyes" && - test "x$with_ayatana_indicators" == "xyes"; then +elif test "x$have_ubuntuindicator" = "xyes" && + test "x$have_ayatanaindicator" = "xyes" && + test "x$with_ayatana_indicators" = "xyes"; then # both Indicator implementations are present, and we are asked to use Ayatana Indicators use_ayatanaindicator=yes; indicator_enforced=yes; -elif test "x$have_ubuntuindicator" == "xyes" && - test "x$have_ayatanaindicator" == "xyes" && - test "x$with_ubuntu_indicators" == "xyes"; then +elif test "x$have_ubuntuindicator" = "xyes" && + test "x$have_ayatanaindicator" = "xyes" && + test "x$with_ubuntu_indicators" = "xyes"; then # both Indicator implementations are present, and we are asked to use Ubuntu Indicators use_ubuntuindicator=yes; indicator_enforced=yes; -elif test "x$have_ubuntuindicator" == "xyes" && +elif test "x$have_ubuntuindicator" = "xyes" && test "x$have_ayatanaindicator" != "xyes" && - test "x$with_ayatana_indicators" == "xyes"; then + test "x$with_ayatana_indicators" = "xyes"; then AC_MSG_ERROR([Ubuntu Indicators are present, but you want to build mate-indicator-applet against Ayatana Indicators. This does not match.]) elif test "x$have_ubuntuindicator" != "xyes" && - test "x$have_ayatanaindicator" == "xyes" && - test "x$with_ubuntu_indicators" == "xyes"; then + test "x$have_ayatanaindicator" = "xyes" && + test "x$with_ubuntu_indicators" = "xyes"; then AC_MSG_ERROR([Ayatana Indicators are present, but you want to build mate-indicator-applet against Ubuntu Indicators. This does not match.]) @@ -135,13 +136,13 @@ fi ### prepare Ayatana or Ubuntu Indicators implementation for the build, regarding to the decision reached above... -if test "x$use_ayatanaindicator" == "xyes"; then +if test "x$use_ayatanaindicator" = "xyes"; then AM_CONDITIONAL(WITH_AYATANA_INDICATOR, true) AM_CONDITIONAL(WITH_UBUNTU_INDICATOR, false) AC_DEFINE(HAVE_AYATANA_INDICATOR, 1, "Ayatana Indicators Support") - if test "x$indicator_enforced" == "xyes"; then + if test "x$indicator_enforced" = "xyes"; then AC_MSG_NOTICE([Using Ayatana Indicators for this build (as requested via configure option).]) else AC_MSG_NOTICE([Using Ayatana Indicators for this build.]) @@ -158,14 +159,14 @@ if test "x$use_ayatanaindicator" == "xyes"; then AC_SUBST(AYATANA_INDICATOR_CFLAGS) AC_SUBST(AYATANA_INDICATOR_LIBS) -elif test "x$use_ubuntuindicator" == "xyes"; then +elif test "x$use_ubuntuindicator" = "xyes"; then # both Indicator implementations are present, and we are asked to use Ubuntu Indicators AM_CONDITIONAL(WITH_UBUNTU_INDICATOR, true) AM_CONDITIONAL(WITH_AYATANA_INDICATOR, false) AC_DEFINE(HAVE_UBUNTU_INDICATOR, 1, "Ubuntu Indicators Support") - if test "x$indicator_enforced" == "xyes"; then + if test "x$indicator_enforced" = "xyes"; then AC_MSG_NOTICE([Using Ubuntu Indicators for this build (as requested via configure option).]) else AC_MSG_NOTICE([Using Ubuntu Indicators for this build.]) @@ -237,14 +238,14 @@ AC_DEFUN([AC_DEFINE_PATH], [ ########################### # Internationalization ########################### +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT([external]) GETTEXT_PACKAGE=mate-indicator-applet AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default gettext domain]) AC_DEFINE_PATH(MATELOCALEDIR, "${datadir}/locale", [locale directory]) -AM_GLIB_GNU_GETTEXT - ############################## # ./configure Flags messings ############################## @@ -278,29 +279,30 @@ AC_DEFINE_PATH(LIBDIR, "${libdir}", [system configuration dir]) # Files ########################### -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile src/Makefile data/Makefile po/Makefile.in ]) +AC_OUTPUT ########################### # Results ########################### -if (test "x$use_ayatanaindicator" == "xyes" && - test "x$have_ayatanaindicator_ng" == "xyes") || - (test "x$use_ubuntuindicator" == "xyes" && - test "x$have_ubuntuindicator_ng" == "xyes"); then +if (test "x$use_ayatanaindicator" = "xyes" && + test "x$have_ayatanaindicator_ng" = "xyes") || + (test "x$use_ubuntuindicator" = "xyes" && + test "x$have_ubuntuindicator_ng" = "xyes"); then have_indicator_ng="yes" else have_indicator_ng="no" fi -if test "x$use_ayatanaindicator" == "xyes"; then +if test "x$use_ayatanaindicator" = "xyes"; then indicator_implementation="Ayatana Indicators" -elif test "x$use_ubuntuindicator" == "xyes"; then +elif test "x$use_ubuntuindicator" = "xyes"; then indicator_implementation="Ubuntu Indicators" fi @@ -309,6 +311,7 @@ AC_MSG_NOTICE([ Indicator Applet Configuration: Prefix: $prefix + Warning cflags: ${WARN_CFLAGS} Indicator implementation: $indicator_implementation Indicator NG support: $have_indicator_ng Indicator Directory: $INDICATORDIR |