From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 4 Dec 2008 00:31:06 +0000 (+0100)
Subject: Avoid relying on m4_copy which has changed in newer autoconf.
X-Git-Tag: v0.1~6639
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=2d4d59aaea5da3c4f1466055c44881ed82833ee5;p=gnulib.git

Avoid relying on m4_copy which has changed in newer autoconf.
---

diff --git a/ChangeLog b/ChangeLog
index 2c90f3665..93dcebffb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+            Bruno Haible  <bruno@clisp.org>
+
+	* m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or newer.
+
 2008-11-29  Jim Meyering  <meyering@redhat.com>
 
 	fts: fix a thinko
diff --git a/m4/openmp.m4 b/m4/openmp.m4
index 8fd510b9e..ba84ea0eb 100644
--- a/m4/openmp.m4
+++ b/m4/openmp.m4
@@ -1,11 +1,15 @@
-# openmp.m4 serial 4
-dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
+# openmp.m4 serial 5
+dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl This file can be removed once we assume autoconf >= 2.62.
 
+dnl Expand to nothing in autoconf >= 2.62. m4_copy has a different
+dnl semantic in autoconf > 2.63.
+m4_ifdef([AC_OPENMP], [], [
+
 # _AC_LANG_OPENMP
 # ---------------
 # Expands to some language dependent source code for testing the presence of
@@ -90,3 +94,5 @@ AC_DEFUN([AC_OPENMP],
   fi
   AC_SUBST([OPENMP_]_AC_LANG_PREFIX[FLAGS])
 ])
+
+])