Re: more m4 quoting

[Simon Josefsson]

Hi Jim.  The patch breaks openmp on debian etch.  The patch below fixes
it, but maybe the remaining quoting also cause problems if you use
fortran (I don't know how to test that).

address@hidden:~$ gnulib-tool --test --with-tests openmp
Module list with included dependencies:
  openmp
File list:
  lib/dummy.c
  m4/gnulib-common.m4
  m4/onceonly.m4
  m4/openmp.m4
executing aclocal -I glm4
configure.ac:101: error: _AC_LANG_OPENMP: unknown language: _AC_LANG
glm4/openmp.m4:11: _AC_LANG_OPENMP is expanded from...
../../lib/autoconf/lang.m4:217: AC_LANG_CONFTEST is expanded from...
../../lib/autoconf/general.m4:2405: AC_LINK_IFELSE is expanded from...
../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from...
../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from...
../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from...
glm4/openmp.m4:11: AC_OPENMP is expanded from...
configure.ac:27: gl_INIT is expanded from...
configure.ac:101: the top level
autom4te: /usr/bin/m4 failed with exit status: 1
aclocal: autom4te failed with exit status: 1
address@hidden:~$ 

address@hidden:~/gnulib$ autoconf --version
autoconf (GNU Autoconf) 2.61
Copyright (C) 2006 Free Software Foundation, Inc.
This is free software.  You may redistribute copies of it under the terms of
the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
There is NO WARRANTY, to the extent permitted by law.

Written by David J. MacKenzie and Akim Demaille.
address@hidden:~/gnulib$ automake --version
automake (GNU automake) 1.10
Written by Tom Tromey <address@hidden>
       and Alexandre Duret-Lutz <address@hidden>.

Copyright 2006 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
address@hidden:~/gnulib$ libtool --version
ltmain.sh (GNU libtool) 1.5.22 Debian 1.5.22-4 (1.1220.2.365 2005/12/18 
22:14:06)

Copyright (C) 2005  Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
address@hidden:~/gnulib$ m4 --version
GNU M4 1.4.8
Copyright (C) 2006 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Written by Rene' Seindal.
address@hidden:~/gnulib$ 

/Simon

diff --git a/m4/openmp.m4 b/m4/openmp.m4
index 8c9c06f..d262c65 100644
--- a/m4/openmp.m4
+++ b/m4/openmp.m4
@@ -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], address@hidden)])
+[_AC_LANG_DISPATCH([$0], _AC_LANG, address@hidden)])
 
 # _AC_LANG_OPENMP(C)
 # ------------------
-m4_define([_AC_LANG_OPENMP([C])],
+m4_define([_AC_LANG_OPENMP(C)],
 [
 #ifndef _OPENMP
  choke me
@@ -30,7 +30,7 @@ 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)
 # ---------------------------