* qpid/cpp/m4/extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): Define only
if undefined.
---
When running bootstrap on a system using autoconf-2.63,
like Fedora 10, it fails like this:
$ ./bootstrap
configure.ac:26: error: AC_REQUIRE: circular dependency of AC_GNU_SOURCE
m4/extensions.m4:19: AC_USE_SYSTEM_EXTENSIONS is expanded from...
../../lib/autoconf/specific.m4:332: AC_GNU_SOURCE is expanded from...
m4/extensions.m4:19: AC_USE_SYSTEM_EXTENSIONS is expanded from...
configure.ac:26: the top level
autom4te: /usr/bin/m4 failed with exit status: 1
aclocal: autom4te failed with exit status: 1
[Exit 1]
That's due to the unconditional definition of AC_USE_SYSTEM_EXTENSIONS
in qpid's m4/extensions.m4. While we could remove that file entirely
(and adjust some dependencies), that would cause problems for people
building with older versions of autoconf. So here's the work-around
I've just committed:
[FYI, I looked into this on request, and Alan signed off on this patch]
qpid/cpp/m4/extensions.m4 | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/qpid/cpp/m4/extensions.m4 b/qpid/cpp/m4/extensions.m4
index 143a9e5..fe7398b 100644
--- a/qpid/cpp/m4/extensions.m4
+++ b/qpid/cpp/m4/extensions.m4
@@ -1,7 +1,7 @@
-# serial 4 -*- Autoconf -*-
+# serial 5 -*- Autoconf -*-
# Enable extensions on systems that normally disable them.
-# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,7 @@
# ------------------------
# Enable extensions on systems that normally disable them,
# typically due to standards-conformance issues.
+m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [], [
AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
[
AC_BEFORE([$0], [AC_COMPILE_IFELSE])
@@ -48,7 +49,7 @@ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
AC_DEFINE([__EXTENSIONS__])
AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
AC_DEFINE([_TANDEM_SOURCE])
-])
+])])
# gl_USE_SYSTEM_EXTENSIONS
# ------------------------
--
1.6.1.rc3.293.g33b6e
