[nautilus-actions] Rename m4 maintainer macros to NA_MAINTAINER_xxx

[Pierre Wieser <pwieser src gnome org>]

commit 80346c4765933f2f15e21f7f5372ba41ae06ad24
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Jan 30 19:42:54 2014 +0100

    Rename m4 maintainer macros to NA_MAINTAINER_xxx

 ChangeLog                                      |    3 +
 configure.ac                                   |   53 +++++++++++-------------
 m4/{na-maintainer-mode.m4 => na-maintainer.m4} |   33 ++++++++++-----
 3 files changed, 49 insertions(+), 40 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c7dd342..7b97d15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-01-30 Pierre Wieser <pwieser trychlos org>
 
+       * m4/na-maintainer-mode.m4: Renamed to m4/na-maintainer.m4.
+       * m4/na-maintainer.m4: Macros are renamed as NA_MAINTAINER_xxxx.
+
        * m4/na-compiler-flags.m4: Renamed to m4/na-compiler.m4.
        * m4/na-compiler.m4: Macros are renamed as NA_COMPILER_xxxx.
 
diff --git a/configure.ac b/configure.ac
index 33c8f1a..9b860bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,28 @@ NA_COMPILER_WARNINGS([],[-ansi -Wno-overlength-strings -Wformat=2])
 NA_COMPILER_LINK_AS_NEEDED
 AC_SUBST([AM_CFLAGS],["${AM_CFLAGS} ${WARN_CFLAGS}"])
 
+# other traditional tools
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+
+# Gnome stuff
+GNOME_COMMON_INIT
+NA_MAINTAINER_CHECK_MODE
+
+# libtool
+AM_PROG_LIBTOOL
+
+# localization
+# note that this same version is also required by autogen.sh
+IT_PROG_INTLTOOL([0.35.5])
+GETTEXT_PACKAGE=${PACKAGE}
+AC_SUBST([GETTEXT_PACKAGE])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["${GETTEXT_PACKAGE}"],[gettext package])
+AM_GLIB_GNU_GETTEXT
+
+# a counter of fatal warnings emitted
+let fma_fatal_count=0
+
 ###
 
 AC_CONFIG_FILES([
@@ -83,38 +105,11 @@ AC_CONFIG_FILES([
        maintainer/Makefile
 ])
 
-# pwi 2009-05-15 disabled as GNOME_COMMON_INIT takes care of that
-#AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
-
-# don't agree with maintainer mode use
-# see http://www.gnu.org/software/automake/manual/automake.html#index-AM_005fMAINTAINER_005fMODE-1001
-# but gnome-autogen.sh forces its usage and gnome_common_init requires it
-AM_MAINTAINER_MODE
-
-# other traditional tools
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-
-# Gnome stuff
-GNOME_COMMON_INIT
-GNOME_MAINTAINER_MODE_DEFINES
-
 # GLib marshaling
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
-# libtool
-AM_PROG_LIBTOOL
-
-# localization
-# note that this same version is also required by autogen.sh
-IT_PROG_INTLTOOL([0.35.5])
-GETTEXT_PACKAGE=${PACKAGE}
-AC_SUBST([GETTEXT_PACKAGE])
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["${GETTEXT_PACKAGE}"],[gettext package])
-AM_GLIB_GNU_GETTEXT
-
 # Enable deprecated functions ?
-NA_CHECK_FOR_DEPRECATED
+NA_MAINTAINER_CHECK_FOR_DEPRECATED
 
 # Have and want GConf support ?
 NA_CHECK_FOR_GCONF
@@ -181,7 +176,7 @@ NA_SET_DEFAULT_IO_PROVIDER([na-desktop])
 NA_NAUTILUS_EXTDIR
 
 # define NA_MAINTAINER_MODE variable
-NA_IS_MAINTAINER_MODE
+NA_MAINTAINER_CHECK_MODE
 AC_DEFINE([NAUTILUS_ACTIONS_DEBUG],["NAUTILUS_ACTIONS_DEBUG"],[Debug environment variable])
 
 # Check for menu update function
diff --git a/m4/na-maintainer-mode.m4 b/m4/na-maintainer.m4
similarity index 67%
rename from m4/na-maintainer-mode.m4
rename to m4/na-maintainer.m4
index b3e4175..aa5e782 100644
--- a/m4/na-maintainer-mode.m4
+++ b/m4/na-maintainer.m4
@@ -25,13 +25,21 @@
 #   Pierre Wieser <pwieser trychlos org>
 #   ... and many others (see AUTHORS)
 
-# serial 3 prefix message with 'msg_'
+# serial 4 rename macro to NA_MAINTAINER_CHECK_MODE
+#                          NA_MAINTAINER_CHECK_FOR_DEPRECATED
 
-dnl define NA_MAINTAINER_MODE
+dnl define NA_MAINTAINER_CHECK_MODE
+dnl
+dnl Don''t agree with maintainer mode use
+dnl See http://www.gnu.org/software/automake/manual/automake.html#maintainer_002dmode
+dnl but gnome-autogen.sh forces its usage and gnome_common_init requires it
+dnl is nonetheless explicitely required by gnome_maintainer_mode_defines macro
+
+AC_DEFUN([NA_MAINTAINER_CHECK_MODE],[
+       AC_REQUIRE([GNOME_MAINTAINER_MODE_DEFINES])
 
-AC_DEFUN([NA_IS_MAINTAINER_MODE],[
        msg_maintainer_mode="disabled"
-       AC_MSG_CHECKING([whether enabling maintainer mode])
+       AC_MSG_CHECKING([whether to enable maintainer mode])
        AC_MSG_RESULT([${USE_MAINTAINER_MODE}])
 
        if test "${USE_MAINTAINER_MODE}" = "yes"; then
@@ -44,22 +52,25 @@ AC_DEFUN([NA_IS_MAINTAINER_MODE],[
        AM_CONDITIONAL([NA_MAINTAINER_MODE], [test "${USE_MAINTAINER_MODE}" = "yes"])
 ])
 
-AC_DEFUN([NA_CHECK_FOR_DEPRECATED],[
+AC_DEFUN([NA_MAINTAINER_CHECK_FOR_DEPRECATED],[
        AC_ARG_ENABLE(
                [deprecated],
                AC_HELP_STRING(
                        [--enable-deprecated],
-                       [whether to enable deprecated functions @<:@no@:>@]
-               ),
-       [enable_deprecated=$enableval],
-       [enable_deprecated="no"]
-       )
+                       [whether to enable deprecated symbols]),
+               [enable_deprecated=$enableval],
+               [enable_deprecated="no"])
 
        AC_MSG_CHECKING([whether deprecated symbols should be enabled])
        AC_MSG_RESULT([${enable_deprecated}])
 
        if test "${enable_deprecated}" = "yes"; then
-               AC_DEFINE([NA_ENABLE_DEPRECATED],[1],[Define to 1 if deprecated functions should be enabled])
+               AC_DEFINE([NA_ENABLE_DEPRECATED],[1],[Define to 1 if deprecated symbols should be enabled])
+       else
+               if test "${na_request_for_deprecated}" = "yes"; then
+                       AC_MSG_WARN([API documentation will be incomplete as deprecated symbols are disabled])
+                       let na_fatal_count+=1
+               fi
        fi
 
        AM_CONDITIONAL([ENABLE_DEPRECATED], [test "${enable_deprecated}" = "yes"])