summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-01-05 15:22:47 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-01-05 15:22:47 +0100
commit08e1eda76b3cf52929a1fe7206ba08f8255f777c (patch)
tree229cec9ac85aba48dcfb51a8ab0c8e85e28f643f /aclocal.m4
parent3a1e50c35d2b3fa53df814ca2545974eae61d592 (diff)
parentd09fb0180e126967c94a13b6414694dfb9be313c (diff)
Merge tag 'upstream/3.15.3'
Upstream version 3.15.3
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m427
1 files changed, 12 insertions, 15 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 69979aa..049e1d3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -45,23 +45,18 @@ AU_DEFUN([GNOME_COMMON_INIT],
in your top-level Makefile.am, instead, where "m4" is the macro directory set
with AC_CONFIG_MACRO_DIR() in your configure.ac]])
-AC_DEFUN([GNOME_DEBUG_CHECK],
+AU_DEFUN([GNOME_DEBUG_CHECK],
[
- AC_ARG_ENABLE([debug],
- AC_HELP_STRING([--enable-debug],
- [turn on debugging]),,
- [enable_debug=no])
-
- if test x$enable_debug = xyes ; then
- AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
- [Enable additional debugging at the expense of performance and size])
- fi
-])
+ AX_CHECK_ENABLE_DEBUG([no],[GNOME_ENABLE_DEBUG])
+],
+[[$0: This macro is deprecated. You should use AX_CHECK_ENABLE_DEBUG instead and
+replace uses of GNOME_ENABLE_DEBUG with ENABLE_DEBUG.
+See: http://www.gnu.org/software/autoconf-archive/ax_check_enable_debug.html#ax_check_enable_debug]])
dnl GNOME_MAINTAINER_MODE_DEFINES ()
dnl define DISABLE_DEPRECATED
dnl
-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
+AU_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
[
AC_REQUIRE([AM_MAINTAINER_MODE])
@@ -74,7 +69,9 @@ AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
fi
AC_SUBST(DISABLE_DEPRECATED)
-])
+],
+[[$0: This macro is deprecated. All of the modules it disables deprecations for
+are obsolete. Remove it and all uses of DISABLE_DEPRECATED.]])
dnl GLIB_GSETTINGS
dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
@@ -744,7 +741,7 @@ EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po)
EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
distdir: distdir-help-files
-distdir-help-files:
+distdir-help-files: $(_HELP_LC_FILES)
@for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
$(MKDIR_P) "$(distdir)/$$lc"; \
for file in $(HELP_FILES); do \
@@ -773,7 +770,7 @@ check-help:
.PHONY: install-help
install-data-am: $(if $(HELP_ID),install-help)
-install-help:
+install-help: $(_HELP_LC_FILES)
@for lc in C $(_HELP_LINGUAS); do \
$(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
done