[gnome-photos/gnome-3-16] build: Updates all AX_* macros from upstream

[Pranav Kant <pranavk src gnome org>]

commit 3dd7b584fcd12395007369f53d856eab9617e7bb
Author: Pranav Kant <pranavk src gnome org>
Date:   Thu Apr 9 15:48:24 2015 +0530

    build: Updates all AX_* macros from upstream
    
    https://bugzilla.gnome.org/show_bug.cgi?id=745972

 m4/ax_check_enable_debug.m4 |   14 +++++++++-----
 m4/ax_is_release.m4         |   11 ++++++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/m4/ax_check_enable_debug.m4 b/m4/ax_check_enable_debug.m4
index 147ffd2..f99d75f 100644
--- a/m4/ax_check_enable_debug.m4
+++ b/m4/ax_check_enable_debug.m4
@@ -26,11 +26,12 @@
 #   Should be invoked prior to any AC_PROG_* compiler checks.
 #
 #   IS-RELEASE can be used to change the default to 'no' when making a
-#   release.  Set IS-RELEASE to 'yes' or 'no' as appropriate, for example by
-#   using the AX_IS_RELEASE macro:
+#   release.  Set IS-RELEASE to 'yes' or 'no' as appropriate. By default, it
+#   uses the value of $ax_is_release, so if you are using the AX_IS_RELEASE
+#   macro, there is no need to pass this parameter.
 #
 #     AX_IS_RELEASE([git-directory])
-#     AX_CHECK_ENABLE_DEBUG(,,,[$ax_is_release])
+#     AX_CHECK_ENABLE_DEBUG()
 #
 # LICENSE
 #
@@ -41,7 +42,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
-#serial 4
+#serial 5
 
 AC_DEFUN([AX_CHECK_ENABLE_DEBUG],[
     AC_BEFORE([$0],[AC_PROG_CC])dnl
@@ -52,9 +53,12 @@ AC_DEFUN([AX_CHECK_ENABLE_DEBUG],[
     AC_MSG_CHECKING(whether to enable debugging)
 
     ax_enable_debug_default=m4_tolower(m4_normalize(ifelse([$1],,[no],[$1])))
+    ax_enable_debug_is_release=m4_tolower(m4_normalize(ifelse([$4],,
+                                                              [$ax_is_release],
+                                                              [$4])))
 
     # If this is a release, override the default.
-    AS_IF([test "$4" = "yes"],
+    AS_IF([test "$ax_enable_debug_is_release" = "yes"],
       [ax_enable_debug_default="no"])
 
     m4_define(ax_enable_debug_vars,[m4_normalize(ifelse([$2],,,[$2]))])
diff --git a/m4/ax_is_release.m4 b/m4/ax_is_release.m4
index 68e11f0..9ec6746 100644
--- a/m4/ax_is_release.m4
+++ b/m4/ax_is_release.m4
@@ -23,6 +23,9 @@
 #    * minor-version:  ax_is_release will be 'no' if the minor version number
 #                      in $PACKAGE_VERSION is odd; this assumes
 #                      $PACKAGE_VERSION follows the 'major.minor.micro' scheme
+#    * micro-version:  ax_is_release will be 'no' if the micro version number
+#                      in $PACKAGE_VERSION is odd; this assumes
+#                      $PACKAGE_VERSION follows the 'major.minor.micro' scheme
 #    * always:         ax_is_release will always be 'yes'
 #    * never:          ax_is_release will always be 'no'
 #
@@ -36,7 +39,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
-#serial 2
+#serial 3
 
 AC_DEFUN([AX_IS_RELEASE],[
     AC_BEFORE([AC_INIT],[$0])
@@ -52,6 +55,12 @@ AC_DEFUN([AX_IS_RELEASE],[
         AS_IF([test "$(( $minor_version % 2 ))" -ne 0],
               [ax_is_release=no],[ax_is_release=yes])
       ],
+      [micro-version],[
+        # $is_release = ($micro_version is even)
+        micro_version=`echo "$PACKAGE_VERSION" | sed 's/[[^.]]*\.[[^.]]*\.\([[^.]]*\).*/\1/'`
+        AS_IF([test "$(( $micro_version % 2 ))" -ne 0],
+              [ax_is_release=no],[ax_is_release=yes])
+      ],
       [always],[ax_is_release=yes],
       [never],[ax_is_release=no],
       [