[nautilus-actions] na_fatal_ configure variables are renamed to fma_fatal_



commit ac6abbd14adfae3fa1faf76dfb3756eb58d7b105
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Sep 9 11:22:03 2015 +0200

    na_fatal_ configure variables are renamed to fma_fatal_

 configure.ac           |   10 +++++-----
 m4/fma-check-module.m4 |    8 ++++----
 m4/na-maintainer.m4    |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8cc64cc..d391279 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,14 +77,14 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["${GETTEXT_PACKAGE}"],[gettext package])
 AM_GLIB_GNU_GETTEXT
 
 # a counter of fatal warnings emitted
-let na_fatal_count=0
-na_fatal_list=""
+let fma_fatal_count=0
+fma_fatal_list=""
 
 # GLib marshaling
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
 if test "${GLIB_GENMARSHAL}" = "no"; then
        AC_MSG_WARN([glib2-devel installed, but glib-genmarshal not found])
-       let na_fatal_count+=1
+       let fma_fatal_count+=1
 fi
 # Have and want GConf support ?
 # As of 3.4 release, we are deprecating GConf, disabling it by default.
@@ -206,8 +206,8 @@ $as_echo "  Maintainer mode                 ${msg_maintainer_mode}
        HTML User's Manuals generation  ${msg_html_manuals}
        PDF User's Manuals generation   ${msg_pdf_manuals}
 "
-if test ${na_fatal_count} -gt 0; then
-       $as_echo "${na_fatal_list}
+if test ${fma_fatal_count} -gt 0; then
+       $as_echo "${fma_fatal_list}
 "
        exit 1
 fi
diff --git a/m4/fma-check-module.m4 b/m4/fma-check-module.m4
index e2b35dc..41df241 100644
--- a/m4/fma-check-module.m4
+++ b/m4/fma-check-module.m4
@@ -63,10 +63,10 @@ AC_DEFUN([_FMA_CHECK_MODULE_MSG],[
        if test "$1" = "no"; then
                AC_MSG_RESULT([warning: $2])
        else
-               let na_fatal_count+=1
-               AC_MSG_WARN([$2 (fatal_count=${na_fatal_count})])
-               if test "${na_fatal_list}" != ""; then na_fatal_list="${na_fatal_list}
+               let fma_fatal_count+=1
+               AC_MSG_WARN([$2 (fatal_count=${fma_fatal_count})])
+               if test "${fma_fatal_list}" != ""; then fma_fatal_list="${fma_fatal_list}
 "; fi
-               na_fatal_list="${na_fatal_list}$2"
+               fma_fatal_list="${fma_fatal_list}$2"
        fi
 ])
diff --git a/m4/na-maintainer.m4 b/m4/na-maintainer.m4
index 0963684..af47f8b 100644
--- a/m4/na-maintainer.m4
+++ b/m4/na-maintainer.m4
@@ -69,7 +69,7 @@ AC_DEFUN([NA_MAINTAINER_CHECK_FOR_DEPRECATED],[
        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
+                       let fma_fatal_count+=1
                fi
        fi
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]