From 73a15056d9347aba42002778308ee398a20584c2 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 15 Jan 2009 13:08:05 +0100 Subject: [PATCH] openmp.m4: revert quote-adding change, for portability to older autoconf * m4/openmp.m4: Remove the quotes added on 2009-01-14. This reverts part of 42d1eda5dcce2d68deab7a642e7f29bcd7144a0d. Simon Josefsson noticed the problem when using autoconf-2.61. --- ChangeLog | 7 +++++++ m4/openmp.m4 | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a905ee33ef..fb11852c6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-01-15 Jim Meyering + + openmp.m4: revert quote-adding change, for portability to older autoconf + * m4/openmp.m4: Remove the quotes added on 2009-01-14. + This reverts part of 42d1eda5dcce2d68deab7a642e7f29bcd7144a0d. + Simon Josefsson noticed the problem when using autoconf-2.61. + 2009-01-15 Bruno Haible * tests/test-fflush2.sh: Invoke test-fflush2 twice. diff --git a/m4/openmp.m4 b/m4/openmp.m4 index 8c9c06f1ae..116e6ce619 100644 --- a/m4/openmp.m4 +++ b/m4/openmp.m4 @@ -1,4 +1,4 @@ -# openmp.m4 serial 6 +# openmp.m4 serial 7 dnl Copyright (C) 2006-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,11 +15,11 @@ m4_ifdef([AC_OPENMP], [], [ # Expands to some language dependent source code for testing the presence of # OpenMP. AC_DEFUN([_AC_LANG_OPENMP], -[_AC_LANG_DISPATCH([$0], [_AC_LANG], [$@])]) +[_AC_LANG_DISPATCH([$0], _AC_LANG, $@)]) # _AC_LANG_OPENMP(C) # ------------------ -m4_define([_AC_LANG_OPENMP([C])], +m4_define([_AC_LANG_OPENMP(C)], [ #ifndef _OPENMP choke me @@ -30,16 +30,16 @@ int main () { return omp_get_num_threads (); } # _AC_LANG_OPENMP(C++) # -------------------- -m4_copy([_AC_LANG_OPENMP([C])], [_AC_LANG_OPENMP([C++])]) +m4_copy([_AC_LANG_OPENMP(C)], [_AC_LANG_OPENMP(C++)]) # _AC_LANG_OPENMP(Fortran 77) # --------------------------- -m4_define([_AC_LANG_OPENMP([Fortran 77])], +m4_define([_AC_LANG_OPENMP(Fortran 77)], [AC_LANG_FUNC_LINK_TRY([omp_get_num_threads])]) # _AC_LANG_OPENMP(Fortran) # --------------------------- -m4_copy([_AC_LANG_OPENMP([Fortran 77])], [_AC_LANG_OPENMP([Fortran])]) +m4_copy([_AC_LANG_OPENMP(Fortran 77)], [_AC_LANG_OPENMP(Fortran)]) # AC_OPENMP # --------- -- 2.30.2