[cheese/wip/kill-gnome-common: 2/4] Use AX_REQUIRE_DEFINED to check for M4 macros
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese/wip/kill-gnome-common: 2/4] Use AX_REQUIRE_DEFINED to check for M4 macros
- Date: Wed, 28 Jan 2015 11:21:29 +0000 (UTC)
commit ef07358b4d428df35b1a08e6a5e61226fd65c3ed
Author: David King <amigadave amigadave com>
Date: Wed Jan 28 09:49:52 2015 +0000
Use AX_REQUIRE_DEFINED to check for M4 macros
https://wiki.gnome.org/Projects/GnomeCommon/Migration
configure.ac | 5 +++++
m4/ax_require_defined.m4 | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2fa9baf..d5d33c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,7 @@ AC_SUBST([LIBCHEESE_GTK_LT_VERSION], [24:19:1])
#*******************************************************************************
AC_SUBST([GETTEXT_PACKAGE], [$PACKAGE_TARNAME])
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [GETTEXT package name])
+AX_REQUIRE_DEFINED([IT_PROG_INTLTOOL])
IT_PROG_INTLTOOL([0.50.0])
#*******************************************************************************
@@ -173,9 +174,11 @@ AS_IF([test "x$GLIB_MKENUMS" = "x"],
[AC_SUBST([GLIB_MKENUMS])
AC_MSG_RESULT([$GLIB_MKENUMS])])
+AX_REQUIRE_DEFINED([GOBJECT_INTROSPECTION_CHECK])
GOBJECT_INTROSPECTION_CHECK([0.6.7])
# API documentation
+AX_REQUIRE_DEFINED([GTK_DOC_CHECK])
GTK_DOC_CHECK([1.14], [--flavour no-tmpl])
# Manpage, generated with gtk-doc and xsltproc from DocBook XML.
@@ -201,9 +204,11 @@ AS_IF([test "x$enable_man" != "xno"],
AM_CONDITIONAL([ENABLE_MAN], [test "x$have_manutils" = "xyes"])
# Mallard help
+AX_REQUIRE_DEFINED([YELP_HELP_INIT])
YELP_HELP_INIT
# AppData
+AX_REQUIRE_DEFINED([APPSTREAM_XML])
APPSTREAM_XML
GLIB_GSETTINGS
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]