[gnome-photos] build: Use AX_REQUIRE_DEFINED to check for m4 macros
- From: Pranav Kant <pranavk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos] build: Use AX_REQUIRE_DEFINED to check for m4 macros
- Date: Thu, 12 Feb 2015 14:44:48 +0000 (UTC)
commit fb889a19b2cbe691a39edbf34f4a0030c8f175c6
Author: Pranav Kant <pranav913 gmail com>
Date: Wed Feb 11 12:03:22 2015 +0530
build: Use AX_REQUIRE_DEFINED to check for m4 macros
https://bugzilla.gnome.org/show_bug.cgi?id=744309
configure.ac | 4 ++++
m4/ax_require_defined.m4 | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9b79a12..6740925 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ GNOME_COMPILE_WARNINGS([maximum])
GNOME_DEBUG_CHECK
GNOME_MAINTAINER_MODE_DEFINES
+AX_REQUIRE_DEFINED([IT_PROG_INTLTOOL])
IT_PROG_INTLTOOL([0.50.1])
GETTEXT_PACKAGE=AC_PACKAGE_TARNAME
@@ -111,6 +112,7 @@ PKG_CHECK_MODULES(LIBEXIF, [libexif >= $LIBEXIF_MIN_VERSION])
PKG_CHECK_MODULES(LIBRSVG, [librsvg-2.0 >= $LIBRSVG_MIN_VERSION])
PKG_CHECK_MODULES(TRACKER, [tracker-control-1.0 tracker-sparql-1.0])
+AX_REQUIRE_DEFINED([LIBGD_INIT])
LIBGD_INIT([
gtk-hacks
main-icon-view
@@ -126,6 +128,7 @@ AC_ARG_ENABLE(dogtail,
enable_dogtail=yes)
AM_CONDITIONAL(ENABLE_DOGTAIL, test "$enable_dogtail" != no)
+AX_REQUIRE_DEFINED([GLIB_TESTS])
GLIB_TESTS
GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
@@ -141,6 +144,7 @@ fi
#Documentation
#############################################
+AX_REQUIRE_DEFINED([YELP_HELP_INIT])
YELP_HELP_INIT
AC_CONFIG_FILES([
diff --git a/m4/ax_require_defined.m4 b/m4/ax_require_defined.m4
new file mode 100644
index 0000000..cae1111
--- /dev/null
+++ b/m4/ax_require_defined.m4
@@ -0,0 +1,37 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_REQUIRE_DEFINED(MACRO)
+#
+# DESCRIPTION
+#
+# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
+# been defined and thus are available for use. This avoids random issues
+# where a macro isn't expanded. Instead the configure script emits a
+# non-fatal:
+#
+# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
+#
+# It's like AC_REQUIRE except it doesn't expand the required macro.
+#
+# Here's an example:
+#
+# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+#
+# LICENSE
+#
+# Copyright (c) 2014 Mike Frysinger <vapier gentoo org>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 1
+
+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
+ m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
+])dnl AX_REQUIRE_DEFINED
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]