[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
m4 quoting improvements
|
From: |
Jim Meyering |
|
Subject: |
m4 quoting improvements |
|
Date: |
Mon, 29 Dec 2008 18:59:59 +0100 |
I've just tweaked a syntax-checking rule in coreutils
that does a simple-minded M4 quoting check of uses of a couple
macros, and it showed there was room for improvement.
Applying the same check here in gnulib showed there
are many many under-quoted arguments. I suspect that none of
these are ever real problems, but it's better to set a good example.
This is just a first coarse/automated pass; I'm sure there
are many more places where it's appropriate to add quotes.
The log for each of the four change sets below has the perl
one-liner to induce the change.
Barring objections (yes, I know I'll have to filter out
files that are imported from other projects, like gettext),
I'll push something like this in a couple days.
All of the changes below were produced by running these four commands,
in order. In retrospect, I probably could have eliminated #2, but
I haven't confirmed that.
perl -pi -e 's/(AC_DEFINE(?:_UNQUOTED)?)\((\w+)([,)])/$1\([$2]$3/' m4/*.m4
perl -pi -e 's/(AC_DEFINE.*, )(rpl_\w+),/$1\[$2\],/' m4/*.m4
perl -pi -e 's/(AC_DEFINE(?:_UNQUOTED)?\(.*?,) ([\$\w]\w+),/$1 [$2],/' m4/*.m4
perl -pi -e 's/(AC_LIBOBJ\()(\w+)\)/$1\[$2])/g' m4/*.m4
>From 452c8361fea38af9f2f361c48fe481dba009b785 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 27 Dec 2008 20:02:00 +0100
Subject: [PATCH 1/4] m4: quote first argument of AC_DEFINE and
AC_DEFINE_UNQUOTED
perl -pi -e 's/(AC_DEFINE(?:_UNQUOTED)?)\((\w+)([,)])/$1\([$2]$3/' m4/*.m4
---
m4/afs.m4 | 2 +-
m4/argp.m4 | 12 ++++++------
m4/c-stack.m4 | 2 +-
m4/chown.m4 | 4 ++--
m4/codeset.m4 | 2 +-
m4/d-ino.m4 | 2 +-
m4/d-type.m4 | 2 +-
m4/dirfd.m4 | 2 +-
m4/eaccess.m4 | 2 +-
m4/fpending.m4 | 2 +-
m4/free.m4 | 2 +-
m4/fsusage.m4 | 16 ++++++++--------
m4/gc-camellia.m4 | 2 +-
m4/gc-random.m4 | 6 +++---
m4/getdate.m4 | 2 +-
m4/getgroups.m4 | 2 +-
m4/getloadavg.m4 | 16 ++++++++--------
m4/gettext.m4 | 6 +++---
m4/host-os.m4 | 2 +-
m4/iconv.m4 | 4 ++--
m4/intdiv0.m4 | 2 +-
m4/intl.m4 | 2 +-
m4/intmax.m4 | 2 +-
m4/intmax_t.m4 | 8 ++++----
m4/inttypes-pri.m4 | 2 +-
m4/inttypes_h.m4 | 2 +-
m4/jm-winsz2.m4 | 2 +-
m4/lcmessage.m4 | 2 +-
m4/link-follow.m4 | 2 +-
m4/ls-mntd-fs.m4 | 22 +++++++++++-----------
m4/mbswidth.m4 | 2 +-
m4/memcmp.m4 | 2 +-
m4/mktime.m4 | 2 +-
m4/mmap-anon.m4 | 4 ++--
m4/openat.m4 | 2 +-
m4/physmem.m4 | 2 +-
m4/poll.m4 | 2 +-
m4/posixver.m4 | 2 +-
m4/printf-posix.m4 | 2 +-
m4/readline.m4 | 2 +-
m4/rename-dest-slash.m4 | 2 +-
m4/rename.m4 | 4 ++--
m4/sig_atomic_t.m4 | 2 +-
m4/sockpfaf.m4 | 4 ++--
m4/st_dm_mode.m4 | 2 +-
m4/stdbool.m4 | 2 +-
m4/stdint_h.m4 | 2 +-
m4/stpncpy.m4 | 2 +-
m4/strnlen.m4 | 2 +-
m4/tm_gmtoff.m4 | 2 +-
m4/tmpfile.m4 | 2 +-
m4/tzset.m4 | 4 ++--
m4/uintmax_t.m4 | 4 ++--
m4/uptime.m4 | 2 +-
m4/utimbuf.m4 | 2 +-
m4/utime.m4 | 2 +-
m4/utimes-null.m4 | 2 +-
m4/vararrays.m4 | 2 +-
m4/wchar_t.m4 | 2 +-
m4/wint_t.m4 | 2 +-
60 files changed, 103 insertions(+), 103 deletions(-)
diff --git a/m4/afs.m4 b/m4/afs.m4
index b5fcd36..b1250f0 100644
--- a/m4/afs.m4
+++ b/m4/afs.m4
@@ -12,6 +12,6 @@ AC_DEFUN([gl_AFS],
[support for the Andrew File System
[[default=no]]]),
test "$withval" = no || with_afs=yes, with_afs=no)
if test "$with_afs" = yes; then
- AC_DEFINE(AFS, 1, [Define if you have the Andrew File System.])
+ AC_DEFINE([AFS], 1, [Define if you have the Andrew File System.])
fi
])
diff --git a/m4/argp.m4 b/m4/argp.m4
index 80cb72f..1610d71 100644
--- a/m4/argp.m4
+++ b/m4/argp.m4
@@ -15,15 +15,15 @@ AC_DEFUN([gl_ARGP],
dnl Note: gl_GETOPT_SUBSTITUTE does AC_LIBOBJ(getopt), AC_LIBOBJ(getopt1).
AC_CHECK_DECL([program_invocation_name],
- [AC_DEFINE(HAVE_DECL_PROGRAM_INVOCATION_NAME, 1,
+ [AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_NAME], 1,
[Define if program_invocation_name is declared])],
- [AC_DEFINE(GNULIB_PROGRAM_INVOCATION_NAME, 1,
+ [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_NAME], 1,
[Define to 1 to add extern declaration of
program_invocation_name to argp.h])],
[#include <errno.h>])
AC_CHECK_DECL([program_invocation_short_name],
- [AC_DEFINE(HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME, 1,
+ [AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME], 1,
[Define if program_invocation_short_name is
declared])],
- [AC_DEFINE(GNULIB_PROGRAM_INVOCATION_SHORT_NAME, 1,
+ [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_SHORT_NAME], 1,
[Define to 1 to add extern declaration of
program_invocation_short_name to argp.h])],
[#include <errno.h>])
@@ -34,7 +34,7 @@ AC_DEFUN([gl_ARGP],
AC_MSG_CHECKING(whether program_invocation_name is defined)
AC_TRY_LINK([#include <argp.h>],
[ program_invocation_name = "test"; ],
- [ AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME,1,
+ [ AC_DEFINE([HAVE_PROGRAM_INVOCATION_NAME],1,
[Define if program_invocation_name is defined])
AC_MSG_RESULT(yes)],
[ AC_MSG_RESULT(no)] )
@@ -42,7 +42,7 @@ AC_DEFUN([gl_ARGP],
AC_MSG_CHECKING(whether program_invocation_short_name is defined)
AC_TRY_LINK([#include <argp.h>],
[ program_invocation_short_name = "test"; ],
- [ AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME,1,
+ [ AC_DEFINE([HAVE_PROGRAM_INVOCATION_SHORT_NAME],1,
[Define if program_invocation_short_name is defined])
AC_MSG_RESULT(yes)],
[ AC_MSG_RESULT(no)] )
diff --git a/m4/c-stack.m4 b/m4/c-stack.m4
index efd6798..739b1e1 100644
--- a/m4/c-stack.m4
+++ b/m4/c-stack.m4
@@ -307,7 +307,7 @@ int main ()
[ac_cv_sys_xsi_stack_overflow_heuristic=cross-compiling])])
if test $ac_cv_sys_xsi_stack_overflow_heuristic = yes; then
- AC_DEFINE(HAVE_XSI_STACK_OVERFLOW_HEURISTIC, 1,
+ AC_DEFINE([HAVE_XSI_STACK_OVERFLOW_HEURISTIC], 1,
[Define to 1 if extending the stack slightly past the limit causes
a SIGSEGV, and an alternate stack can be established with sigaltstack,
and the signal handler is passed a context that specifies the
diff --git a/m4/chown.m4 b/m4/chown.m4
index 89761f5..ab83f27 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -22,7 +22,7 @@ AC_DEFUN([gl_FUNC_CHOWN],
AC_REQUIRE([gl_FUNC_CHOWN_FOLLOWS_SYMLINK])
if test $ac_cv_func_chown_works = no; then
- AC_DEFINE(CHOWN_FAILS_TO_HONOR_ID_OF_NEGATIVE_ONE, 1,
+ AC_DEFINE([CHOWN_FAILS_TO_HONOR_ID_OF_NEGATIVE_ONE], 1,
[Define if chown is not POSIX compliant regarding IDs of -1.])
fi
@@ -71,7 +71,7 @@ AC_DEFUN([gl_FUNC_CHOWN_FOLLOWS_SYMLINK],
)
if test $gl_cv_func_chown_follows_symlink = no; then
- AC_DEFINE(CHOWN_MODIFIES_SYMLINK, 1,
+ AC_DEFINE([CHOWN_MODIFIES_SYMLINK], 1,
[Define if chown modifies symlinks.])
fi
])
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index 223955b..526b07d 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -15,7 +15,7 @@ AC_DEFUN([AM_LANGINFO_CODESET],
am_cv_langinfo_codeset=no)
])
if test $am_cv_langinfo_codeset = yes; then
- AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+ AC_DEFINE([HAVE_LANGINFO_CODESET], 1,
[Define if you have <langinfo.h> and nl_langinfo(CODESET).])
fi
])
diff --git a/m4/d-ino.m4 b/m4/d-ino.m4
index 6e6dab3..ce8280d 100644
--- a/m4/d-ino.m4
+++ b/m4/d-ino.m4
@@ -34,7 +34,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO],
[gl_cv_struct_dirent_d_ino=no],
[gl_cv_struct_dirent_d_ino=no])])
if test $gl_cv_struct_dirent_d_ino = yes; then
- AC_DEFINE(D_INO_IN_DIRENT, 1,
+ AC_DEFINE([D_INO_IN_DIRENT], 1,
[Define if struct dirent has a member d_ino that actually works.])
fi
]
diff --git a/m4/d-type.m4 b/m4/d-type.m4
index 92f9b15..e4a3392 100644
--- a/m4/d-type.m4
+++ b/m4/d-type.m4
@@ -27,7 +27,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE],
]
)
if test $gl_cv_struct_dirent_d_type = yes; then
- AC_DEFINE(HAVE_STRUCT_DIRENT_D_TYPE, 1,
+ AC_DEFINE([HAVE_STRUCT_DIRENT_D_TYPE], 1,
[Define if there is a member named d_type in the struct describing
directory headers.])
fi
diff --git a/m4/dirfd.m4 b/m4/dirfd.m4
index baab4dd..ea02250 100644
--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -69,7 +69,7 @@ AC_DEFUN([gl_FUNC_DIRFD],
]
)
if test $gl_cv_sys_dir_fd_member_name != no_such_member; then
- AC_DEFINE_UNQUOTED(DIR_FD_MEMBER_NAME,
+ AC_DEFINE_UNQUOTED([DIR_FD_MEMBER_NAME],
$gl_cv_sys_dir_fd_member_name,
[the name of the file descriptor member of DIR])
fi
diff --git a/m4/eaccess.m4 b/m4/eaccess.m4
index 58dba2b..9be046d 100644
--- a/m4/eaccess.m4
+++ b/m4/eaccess.m4
@@ -7,6 +7,6 @@ dnl with or without modifications, as long as this notice is
preserved.
AC_DEFUN([gl_FUNC_EACCESS],
[
AC_CHECK_FUNC(eaccess, ,
- [AC_DEFINE(eaccess, access,
+ [AC_DEFINE([eaccess], access,
[Define as 'access' if you don't have the eaccess() function.])])
])
diff --git a/m4/fpending.m4 b/m4/fpending.m4
index 65d2ddd..716125d 100644
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -78,7 +78,7 @@ AC_DEFUN([gl_FUNC_FPENDING],
ac_cv_sys_pending_output_n_bytes=$ac_expr
]
)
- AC_DEFINE_UNQUOTED(PENDING_OUTPUT_N_BYTES,
+ AC_DEFINE_UNQUOTED([PENDING_OUTPUT_N_BYTES],
$ac_cv_sys_pending_output_n_bytes,
[the number of pending output bytes on stream `fp'])
AC_LIBOBJ([fpending])
diff --git a/m4/free.m4 b/m4/free.m4
index 566734b..6ed4b24 100644
--- a/m4/free.m4
+++ b/m4/free.m4
@@ -31,7 +31,7 @@ AC_DEFUN([gl_FUNC_FREE],
if test $gl_cv_func_free = no; then
AC_LIBOBJ(free)
- AC_DEFINE(free, rpl_free,
+ AC_DEFINE([free], rpl_free,
[Define to rpl_free if the replacement function should be used.])
fi
])
diff --git a/m4/fsusage.m4 b/m4/fsusage.m4
index c99d0ec..831f64f 100644
--- a/m4/fsusage.m4
+++ b/m4/fsusage.m4
@@ -65,7 +65,7 @@ a system call.
fu_cv_sys_stat_statvfs=no)])
if test $fu_cv_sys_stat_statvfs = yes; then
ac_fsusage_space=yes
- AC_DEFINE(STAT_STATVFS, 1,
+ AC_DEFINE([STAT_STATVFS], 1,
[ Define if there is a function named statvfs. (SVR4)])
fi
fi
@@ -91,7 +91,7 @@ if test $ac_fsusage_space = no; then
AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
ac_fsusage_space=yes
- AC_DEFINE(STAT_STATFS3_OSF1, 1,
+ AC_DEFINE([STAT_STATFS3_OSF1], 1,
[ Define if statfs takes 3 args. (DEC Alpha running OSF/1)])
fi
fi
@@ -124,7 +124,7 @@ member (AIX, 4.3BSD)])
AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
if test $fu_cv_sys_stat_statfs2_bsize = yes; then
ac_fsusage_space=yes
- AC_DEFINE(STAT_STATFS2_BSIZE, 1,
+ AC_DEFINE([STAT_STATFS2_BSIZE], 1,
[ Define if statfs takes 2 args and struct statfs has a field named f_bsize.
(4.3BSD, SunOS 4, HP-UX, AIX PS/2)])
fi
@@ -148,7 +148,7 @@ if test $ac_fsusage_space = no; then
AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
if test $fu_cv_sys_stat_statfs4 = yes; then
ac_fsusage_space=yes
- AC_DEFINE(STAT_STATFS4, 1,
+ AC_DEFINE([STAT_STATFS4], 1,
[ Define if statfs takes 4 args. (SVR3, Dynix, Irix, Dolphin)])
fi
fi
@@ -178,7 +178,7 @@ member (4.4BSD and NetBSD)])
AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
if test $fu_cv_sys_stat_statfs2_fsize = yes; then
ac_fsusage_space=yes
- AC_DEFINE(STAT_STATFS2_FSIZE, 1,
+ AC_DEFINE([STAT_STATFS2_FSIZE], 1,
[ Define if statfs takes 2 args and struct statfs has a field named f_fsize.
(4.4BSD, NetBSD)])
fi
@@ -212,7 +212,7 @@ if test $ac_fsusage_space = no; then
AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
if test $fu_cv_sys_stat_fs_data = yes; then
ac_fsusage_space=yes
- AC_DEFINE(STAT_STATFS2_FS_DATA, 1,
+ AC_DEFINE([STAT_STATFS2_FS_DATA], 1,
[ Define if statfs takes 2 args and the second argument has
type struct fs_data. (Ultrix)])
fi
@@ -222,7 +222,7 @@ if test $ac_fsusage_space = no; then
# SVR2
AC_TRY_CPP([#include <sys/filsys.h>
],
- AC_DEFINE(STAT_READ_FILSYS, 1,
+ AC_DEFINE([STAT_READ_FILSYS], 1,
[Define if there is no specific function for reading file systems usage
information and you have the <sys/filsys.h> header file. (SVR2)])
ac_fsusage_space=yes)
@@ -251,7 +251,7 @@ choke -- this is a workaround for a Sun-specific problem
[fu_cv_sys_truncating_statfs=yes],
[fu_cv_sys_truncating_statfs=no])])
if test $fu_cv_sys_truncating_statfs = yes; then
- AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1,
+ AC_DEFINE([STATFS_TRUNCATES_BLOCK_COUNTS], 1,
[Define if the block counts reported by statfs may be truncated to 2GB
and the correct values may be stored in the f_spare array.
(SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem.
diff --git a/m4/gc-camellia.m4 b/m4/gc-camellia.m4
index c1fb02f..85f6caa 100644
--- a/m4/gc-camellia.m4
+++ b/m4/gc-camellia.m4
@@ -14,7 +14,7 @@ AC_DEFUN([gl_GC_CAMELLIA],
[gl_cv_libgcrypt_camellia=yes],
[gl_cv_libgcrypt_camellia=no])])
if test "$gl_cv_libgcrypt_camellia" = yes; then
- AC_DEFINE(HAVE_CAMELLIA, 1, [Define if your libgcrypt supports
Camellia.])
+ AC_DEFINE([HAVE_CAMELLIA], 1, [Define if your libgcrypt supports
Camellia.])
fi
fi
])
diff --git a/m4/gc-random.m4 b/m4/gc-random.m4
index c66e071..4a55727 100644
--- a/m4/gc-random.m4
+++ b/m4/gc-random.m4
@@ -77,11 +77,11 @@ AC_DEFUN([gl_GC_RANDOM],
# FIXME?: Open+read 42 bytes+close twice and compare data. Should differ.
- AC_DEFINE_UNQUOTED(NAME_OF_RANDOM_DEVICE, "$NAME_OF_RANDOM_DEVICE",
+ AC_DEFINE_UNQUOTED([NAME_OF_RANDOM_DEVICE], "$NAME_OF_RANDOM_DEVICE",
[defined to the name of the (strong) random device])
- AC_DEFINE_UNQUOTED(NAME_OF_PSEUDO_RANDOM_DEVICE,
+ AC_DEFINE_UNQUOTED([NAME_OF_PSEUDO_RANDOM_DEVICE],
"$NAME_OF_PSEUDO_RANDOM_DEVICE",
[defined to the name of the pseudo random device])
- AC_DEFINE_UNQUOTED(NAME_OF_NONCE_DEVICE, "$NAME_OF_NONCE_DEVICE",
+ AC_DEFINE_UNQUOTED([NAME_OF_NONCE_DEVICE], "$NAME_OF_NONCE_DEVICE",
[defined to the name of the unpredictable nonce device])
])
diff --git a/m4/getdate.m4 b/m4/getdate.m4
index c335243..20f644f 100644
--- a/m4/getdate.m4
+++ b/m4/getdate.m4
@@ -19,7 +19,7 @@ AC_DEFUN([gl_C_COMPOUND_LITERALS],
gl_cv_compound_literals=yes,
gl_cv_compound_literals=no)])
if test $gl_cv_compound_literals = yes; then
- AC_DEFINE(HAVE_COMPOUND_LITERALS, 1,
+ AC_DEFINE([HAVE_COMPOUND_LITERALS], 1,
[Define if you have compound literals.])
fi
])
diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index 0364752..bc1a56f 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_GETGROUPS],
AC_REQUIRE([AC_FUNC_GETGROUPS])
if test "$ac_cv_func_getgroups_works" != yes; then
AC_LIBOBJ(getgroups)
- AC_DEFINE(getgroups, rpl_getgroups,
+ AC_DEFINE([getgroups], rpl_getgroups,
[Define as rpl_getgroups if getgroups doesn't work right.])
gl_PREREQ_GETGROUPS
fi
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
index 58808f6..923b66e 100644
--- a/m4/getloadavg.m4
+++ b/m4/getloadavg.m4
@@ -82,7 +82,7 @@ Yowza Am I SETGID yet
gl_cv_func_getloadavg_setgid=no)])
if test $gl_cv_func_getloadavg_setgid = yes; then
NEED_SETGID=true
- AC_DEFINE(GETLOADAVG_PRIVILEGED, 1,
+ AC_DEFINE([GETLOADAVG_PRIVILEGED], 1,
[Define to 1 if the `getloadavg' function needs to be run setuid
or setgid.])
else
@@ -133,12 +133,12 @@ AC_CHECK_DECL([getloadavg], [], [HAVE_DECL_GETLOADAVG=0],
# Set up the AC_LIBOBJ replacement of `getloadavg'.
AC_DEFUN([gl_PREREQ_GETLOADAVG],
[AC_LIBOBJ(getloadavg)
-AC_DEFINE(C_GETLOADAVG, 1, [Define to 1 if using `getloadavg.c'.])
+AC_DEFINE([C_GETLOADAVG], 1, [Define to 1 if using `getloadavg.c'.])
# Figure out what our getloadavg.c needs.
gl_have_func=no
AC_CHECK_HEADER(sys/dg_sys_info.h,
[gl_have_func=yes
- AC_DEFINE(DGUX, 1, [Define to 1 for DGUX with <sys/dg_sys_info.h>.])
+ AC_DEFINE([DGUX], 1, [Define to 1 for DGUX with <sys/dg_sys_info.h>.])
AC_CHECK_LIB(dgc, dg_sys_info)])
# We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it
@@ -146,21 +146,21 @@ AC_CHECK_HEADER(sys/dg_sys_info.h,
# Irix 4.0.5F has the header but not the library.
if test $gl_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes; then
gl_have_func=yes
- AC_DEFINE(SVR4, 1, [Define to 1 on System V Release 4.])
+ AC_DEFINE([SVR4], 1, [Define to 1 on System V Release 4.])
fi
if test $gl_have_func = no; then
AC_CHECK_HEADER(inq_stats/cpustats.h,
[gl_have_func=yes
- AC_DEFINE(UMAX, 1, [Define to 1 for Encore UMAX.])
- AC_DEFINE(UMAX4_3, 1,
+ AC_DEFINE([UMAX], 1, [Define to 1 for Encore UMAX.])
+ AC_DEFINE([UMAX4_3], 1,
[Define to 1 for Encore UMAX 4.3 that has <inq_status/cpustats.h>
instead of <sys/cpustats.h>.])])
fi
if test $gl_have_func = no; then
AC_CHECK_HEADER(sys/cpustats.h,
- [gl_have_func=yes; AC_DEFINE(UMAX)])
+ [gl_have_func=yes; AC_DEFINE([UMAX])])
fi
if test $gl_have_func = no; then
@@ -169,7 +169,7 @@ fi
AC_CHECK_HEADERS(nlist.h,
[AC_CHECK_MEMBERS([struct nlist.n_un.n_name],
- [AC_DEFINE(NLIST_NAME_UNION, 1,
+ [AC_DEFINE([NLIST_NAME_UNION], 1,
[Define to 1 if your `struct nlist' has an
`n_un' member. Obsolete, depend on
`HAVE_STRUCT_NLIST_N_UN_N_NAME])], [],
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index c9ae1f7..9d8e955 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -267,7 +267,7 @@ return * gettext ("")$gt_expression_test_code +
_nl_msg_cat_cntr + *_nl_expand_a
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
- AC_DEFINE(ENABLE_NLS, 1,
+ AC_DEFINE([ENABLE_NLS], 1,
[Define to 1 if translation of program messages to the user's native
language
is requested.])
else
@@ -301,9 +301,9 @@ return * gettext ("")$gt_expression_test_code +
_nl_msg_cat_cntr + *_nl_expand_a
fi
dnl For backward compatibility. Some packages may be using this.
- AC_DEFINE(HAVE_GETTEXT, 1,
+ AC_DEFINE([HAVE_GETTEXT], 1,
[Define if the GNU gettext() function is already present or
preinstalled.])
- AC_DEFINE(HAVE_DCGETTEXT, 1,
+ AC_DEFINE([HAVE_DCGETTEXT], 1,
[Define if the GNU dcgettext() function is already present or
preinstalled.])
fi
diff --git a/m4/host-os.m4 b/m4/host-os.m4
index 0b7efb6..5cddc68 100644
--- a/m4/host-os.m4
+++ b/m4/host-os.m4
@@ -76,7 +76,7 @@ AC_DEFUN([gl_HOST_OS],
os=$host_os;;
esac
gl_cv_host_operating_system=$os]])
- AC_DEFINE_UNQUOTED(HOST_OPERATING_SYSTEM,
+ AC_DEFINE_UNQUOTED([HOST_OPERATING_SYSTEM],
"$gl_cv_host_operating_system",
[The host operating system.])
])
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 66bc76f..394afd2 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -134,7 +134,7 @@ int main ()
am_func_iconv=no am_cv_lib_iconv=no
fi
if test "$am_func_iconv" = yes; then
- AC_DEFINE(HAVE_ICONV, 1,
+ AC_DEFINE([HAVE_ICONV], 1,
[Define if you have the iconv() function and it works.])
fi
if test "$am_cv_lib_iconv" = yes; then
@@ -174,7 +174,7 @@ size_t iconv();
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/(
/(/'`
AC_MSG_RESULT([$]{ac_t:-
}[$]am_cv_proto_iconv)
- AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+ AC_DEFINE_UNQUOTED([ICONV_CONST], $am_cv_proto_iconv_arg1,
[Define as const if the declaration of iconv() needs const.])
fi
])
diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4
index 8c8a670..ad03550 100644
--- a/m4/intdiv0.m4
+++ b/m4/intdiv0.m4
@@ -79,6 +79,6 @@ changequote([,])dnl
*yes) value=1;;
*) value=0;;
esac
- AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
+ AC_DEFINE_UNQUOTED([INTDIV0_RAISES_SIGFPE], $value,
[Define if integer division by zero raises signal SIGFPE.])
])
diff --git a/m4/intl.m4 b/m4/intl.m4
index 934408b..719b8e8 100644
--- a/m4/intl.m4
+++ b/m4/intl.m4
@@ -228,7 +228,7 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
gt_cv_nl_locale_name=no)
])
if test $gt_cv_nl_locale_name = yes; then
- AC_DEFINE(HAVE_NL_LOCALE_NAME, 1,
+ AC_DEFINE([HAVE_NL_LOCALE_NAME], 1,
[Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro
if _GNU_SOURCE is defined.])
fi
diff --git a/m4/intmax.m4 b/m4/intmax.m4
index ce7a8a4..f9f3742 100644
--- a/m4/intmax.m4
+++ b/m4/intmax.m4
@@ -27,7 +27,7 @@ AC_DEFUN([gt_TYPE_INTMAX_T],
gt_cv_c_intmax_t=yes,
gt_cv_c_intmax_t=no)])
if test $gt_cv_c_intmax_t = yes; then
- AC_DEFINE(HAVE_INTMAX_T, 1,
+ AC_DEFINE([HAVE_INTMAX_T], 1,
[Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
fi
])
diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4
index 50ae35d..baaf303 100644
--- a/m4/intmax_t.m4
+++ b/m4/intmax_t.m4
@@ -22,10 +22,10 @@ AC_DEFUN([gl_AC_TYPE_INTMAX_T],
test $ac_cv_type_long_long_int = yes \
&& ac_type='long long' \
|| ac_type='long'
- AC_DEFINE_UNQUOTED(intmax_t, $ac_type,
+ AC_DEFINE_UNQUOTED([intmax_t], $ac_type,
[Define to long or long long if <inttypes.h> and <stdint.h> don't
define.])
else
- AC_DEFINE(HAVE_INTMAX_T, 1,
+ AC_DEFINE([HAVE_INTMAX_T], 1,
[Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
fi
])
@@ -48,14 +48,14 @@ AC_DEFUN([gt_AC_TYPE_INTMAX_T],
#endif
], [intmax_t x = -1; return !x;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
if test $gt_cv_c_intmax_t = yes; then
- AC_DEFINE(HAVE_INTMAX_T, 1,
+ AC_DEFINE([HAVE_INTMAX_T], 1,
[Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
else
AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
test $ac_cv_type_long_long_int = yes \
&& ac_type='long long' \
|| ac_type='long'
- AC_DEFINE_UNQUOTED(intmax_t, $ac_type,
+ AC_DEFINE_UNQUOTED([intmax_t], $ac_type,
[Define to long or long long if <stdint.h> and <inttypes.h> don't
define.])
fi
])
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
index 7c7f894..57f864a 100644
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -26,7 +26,7 @@ char *p = PRId32;
])
fi
if test "$gt_cv_inttypes_pri_broken" = yes; then
- AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
+ AC_DEFINE_UNQUOTED([PRI_MACROS_BROKEN], 1,
[Define if <inttypes.h> exists and defines unusable PRI* macros.])
PRI_MACROS_BROKEN=1
else
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index edc8ecb..fb2a6aa 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -19,7 +19,7 @@ AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
gl_cv_header_inttypes_h=yes,
gl_cv_header_inttypes_h=no)])
if test $gl_cv_header_inttypes_h = yes; then
- AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
+ AC_DEFINE_UNQUOTED([HAVE_INTTYPES_H_WITH_UINTMAX], 1,
[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
and declares uintmax_t. ])
fi
diff --git a/m4/jm-winsz2.m4 b/m4/jm-winsz2.m4
index ee710a5..2c2292e 100644
--- a/m4/jm-winsz2.m4
+++ b/m4/jm-winsz2.m4
@@ -22,7 +22,7 @@ AC_DEFUN([gl_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
fi
])
if test $gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h = yes; then
- AC_DEFINE(GWINSZ_IN_SYS_IOCTL, 1,
+ AC_DEFINE([GWINSZ_IN_SYS_IOCTL], 1,
[Define if your system defines TIOCGWINSZ in sys/ioctl.h.])
fi
])
diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
index 19aa77e..1119a15 100644
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -24,7 +24,7 @@ AC_DEFUN([gt_LC_MESSAGES],
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
if test $gt_cv_val_LC_MESSAGES = yes; then
- AC_DEFINE(HAVE_LC_MESSAGES, 1,
+ AC_DEFINE([HAVE_LC_MESSAGES], 1,
[Define if your <locale.h> file defines LC_MESSAGES.])
fi
])
diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index ceec067..539daae 100644
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -58,7 +58,7 @@ AC_DEFUN([gl_AC_FUNC_LINK_FOLLOWS_SYMLINK],
)
])
if test $gl_ac_cv_func_link_follows_symlink = yes; then
- AC_DEFINE(LINK_FOLLOWS_SYMLINKS, 1,
+ AC_DEFINE([LINK_FOLLOWS_SYMLINKS], 1,
[Define if `link(2)' dereferences symbolic links.])
fi
])
diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4
index 21ac4e7..c584c58 100644
--- a/m4/ls-mntd-fs.m4
+++ b/m4/ls-mntd-fs.m4
@@ -92,7 +92,7 @@ yes
AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
if test $fu_cv_sys_mounted_cray_listmntent = yes; then
ac_list_mounted_fs=found
- AC_DEFINE(MOUNTED_LISTMNTENT, 1,
+ AC_DEFINE([MOUNTED_LISTMNTENT], 1,
[Define if there is a function named listmntent that can be used to
list all mounted file systems. (UNICOS)])
fi
@@ -108,7 +108,7 @@ if test -z "$ac_list_mounted_fs"; then
AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
if test $fu_cv_sys_mounted_vmount = yes; then
ac_list_mounted_fs=found
- AC_DEFINE(MOUNTED_VMOUNT, 1,
+ AC_DEFINE([MOUNTED_VMOUNT], 1,
[Define if there is a function named mntctl that can be used to read
the list of mounted file systems, and there is a system header file
that declares `struct vmount.' (AIX)])
@@ -148,7 +148,7 @@ if test $ac_cv_func_getmntent = yes; then
AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
if test $fu_cv_sys_mounted_getmntent1 = yes; then
ac_list_mounted_fs=found
- AC_DEFINE(MOUNTED_GETMNTENT1, 1,
+ AC_DEFINE([MOUNTED_GETMNTENT1], 1,
[Define if there is a function named getmntent for reading the list
of mounted file systems, and that function takes a single argument.
(4.3BSD, SunOS, HP-UX, Dynix, Irix)])
@@ -165,7 +165,7 @@ if test $ac_cv_func_getmntent = yes; then
AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
if test $fu_cv_sys_mounted_getmntent2 = yes; then
ac_list_mounted_fs=found
- AC_DEFINE(MOUNTED_GETMNTENT2, 1,
+ AC_DEFINE([MOUNTED_GETMNTENT2], 1,
[Define if there is a function named getmntent for reading the list of
mounted file systems, and that function takes two arguments. (SVR4)])
AC_CHECK_FUNCS(hasmntopt)
@@ -197,7 +197,7 @@ if test -z "$ac_list_mounted_fs"; then
AC_MSG_RESULT($fu_cv_sys_mounted_getfsstat)
if test $fu_cv_sys_mounted_getfsstat = yes; then
ac_list_mounted_fs=found
- AC_DEFINE(MOUNTED_GETFSSTAT, 1,
+ AC_DEFINE([MOUNTED_GETFSSTAT], 1,
[Define if there is a function named getfsstat for reading the
list of mounted file systems. (DEC Alpha running OSF/1)])
fi
@@ -216,7 +216,7 @@ if test -z "$ac_list_mounted_fs"; then
AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
if test $fu_cv_sys_mounted_fread_fstyp = yes; then
ac_list_mounted_fs=found
- AC_DEFINE(MOUNTED_FREAD_FSTYP, 1,
+ AC_DEFINE([MOUNTED_FREAD_FSTYP], 1,
[Define if (like SVR2) there is no specific function for reading the
list of mounted file systems, and your system has these header files:
<sys/fstyp.h> and <sys/statfs.h>. (SVR3)])
@@ -256,13 +256,13 @@ extern int getmntinfo (struct statfs **, int);
AC_MSG_RESULT([$fu_cv_sys_mounted_getmntinfo2])
if test $fu_cv_sys_mounted_getmntinfo2 = no; then
ac_list_mounted_fs=found
- AC_DEFINE(MOUNTED_GETMNTINFO, 1,
+ AC_DEFINE([MOUNTED_GETMNTINFO], 1,
[Define if there is a function named getmntinfo for reading the
list of mounted file systems and it returns an array of
'struct statfs'. (4.4BSD, Darwin)])
else
ac_list_mounted_fs=found
- AC_DEFINE(MOUNTED_GETMNTINFO2, 1,
+ AC_DEFINE([MOUNTED_GETMNTINFO2], 1,
[Define if there is a function named getmntinfo for reading the
list of mounted file systems and it returns an array of
'struct statvfs'. (NetBSD 3.0)])
@@ -282,7 +282,7 @@ if test -z "$ac_list_mounted_fs"; then
AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
if test $fu_cv_sys_mounted_getmnt = yes; then
ac_list_mounted_fs=found
- AC_DEFINE(MOUNTED_GETMNT, 1,
+ AC_DEFINE([MOUNTED_GETMNT], 1,
[Define if there is a function named getmnt for reading the list of
mounted file systems. (Ultrix)])
fi
@@ -303,7 +303,7 @@ if test -z "$ac_list_mounted_fs"; then
AC_MSG_RESULT($fu_result)
if test $fu_result = yes; then
ac_list_mounted_fs=found
- AC_DEFINE(MOUNTED_FS_STAT_DEV, 1,
+ AC_DEFINE([MOUNTED_FS_STAT_DEV], 1,
[Define if there are functions named next_dev and fs_stat_dev for
reading the list of mounted file systems. (BeOS)])
fi
@@ -319,7 +319,7 @@ if test -z "$ac_list_mounted_fs"; then
AC_MSG_RESULT($fu_cv_sys_mounted_fread)
if test $fu_cv_sys_mounted_fread = yes; then
ac_list_mounted_fs=found
- AC_DEFINE(MOUNTED_FREAD, 1,
+ AC_DEFINE([MOUNTED_FREAD], 1,
[Define if there is no specific function for reading the list of
mounted file systems. fread will be used to read /etc/mnttab.
(SVR2) ])
diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4
index 82ebe44..6e8da02 100644
--- a/m4/mbswidth.m4
+++ b/m4/mbswidth.m4
@@ -35,7 +35,7 @@ AC_DEFUN([gl_MBSWIDTH],
else
ac_val=0
fi
- AC_DEFINE_UNQUOTED(HAVE_DECL_MBSWIDTH_IN_WCHAR_H, $ac_val,
+ AC_DEFINE_UNQUOTED([HAVE_DECL_MBSWIDTH_IN_WCHAR_H], $ac_val,
[Define to 1 if you have a declaration of mbswidth() in <wchar.h>, and to
0 otherwise.])
AC_TYPE_MBSTATE_T
diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index c995a32..4f6b157 100644
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_MEMCMP],
AC_FUNC_MEMCMP
dnl Note: AC_FUNC_MEMCMP does AC_LIBOBJ(memcmp).
if test $ac_cv_func_memcmp_working = no; then
- AC_DEFINE(memcmp, rpl_memcmp,
+ AC_DEFINE([memcmp], rpl_memcmp,
[Define to rpl_memcmp if the replacement function should be used.])
gl_PREREQ_MEMCMP
fi
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 5faf393..261d340 100644
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -214,7 +214,7 @@ AC_DEFUN([gl_FUNC_MKTIME],
AC_FUNC_MKTIME
dnl Note: AC_FUNC_MKTIME does AC_LIBOBJ(mktime).
if test $ac_cv_func_working_mktime = no; then
- AC_DEFINE(mktime, rpl_mktime,
+ AC_DEFINE([mktime], rpl_mktime,
[Define to rpl_mktime if the replacement function should be used.])
gl_PREREQ_MKTIME
fi
diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4
index 13fbd3c..802a725 100644
--- a/m4/mmap-anon.m4
+++ b/m4/mmap-anon.m4
@@ -34,13 +34,13 @@ AC_DEFUN([gl_FUNC_MMAP_ANON],
I cant identify this map.
#endif
],
- [AC_DEFINE(MAP_ANONYMOUS, MAP_ANON,
+ [AC_DEFINE([MAP_ANONYMOUS], MAP_ANON,
[Define to a substitute value for mmap()'s MAP_ANONYMOUS flag.])
gl_have_mmap_anonymous=yes])
fi
AC_MSG_RESULT($gl_have_mmap_anonymous)
if test $gl_have_mmap_anonymous = yes; then
- AC_DEFINE(HAVE_MAP_ANONYMOUS, 1,
+ AC_DEFINE([HAVE_MAP_ANONYMOUS], 1,
[Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after
including
config.h and <sys/mman.h>.])
fi
diff --git a/m4/openat.m4 b/m4/openat.m4
index 3b5b7ca..53d8667 100644
--- a/m4/openat.m4
+++ b/m4/openat.m4
@@ -80,7 +80,7 @@ AC_DEFUN([gl_FUNC_FCHOWNAT],
if test $use_replacement_fchownat = yes; then
AC_LIBOBJ(fchownat)
- AC_DEFINE(fchownat, rpl_fchownat,
+ AC_DEFINE([fchownat], rpl_fchownat,
[Define to rpl_fchownat if the replacement function should be used.])
fi
])
diff --git a/m4/physmem.m4 b/m4/physmem.m4
index b5001e1..9bc67c4 100644
--- a/m4/physmem.m4
+++ b/m4/physmem.m4
@@ -18,7 +18,7 @@ AC_DEFUN([gl_SYS__SYSTEM_CONFIGURATION],
[gl_cv_var__system_configuration=no])])
if test $gl_cv_var__system_configuration = yes; then
- AC_DEFINE(HAVE__SYSTEM_CONFIGURATION, 1,
+ AC_DEFINE([HAVE__SYSTEM_CONFIGURATION], 1,
[Define to 1 if you have the external variable,
_system_configuration with a member named physmem.])
fi
diff --git a/m4/poll.m4 b/m4/poll.m4
index bb610da..424eeb6 100644
--- a/m4/poll.m4
+++ b/m4/poll.m4
@@ -56,7 +56,7 @@ This is MacOSX or AIX
POLL_H=
else
AC_LIBOBJ(poll)
- AC_DEFINE(poll, rpl_poll,
+ AC_DEFINE([poll], rpl_poll,
[Define to poll if the replacement function should be used.])
gl_PREREQ_POLL
POLL_H=poll.h
diff --git a/m4/posixver.m4 b/m4/posixver.m4
index f60a094..e627cd7 100644
--- a/m4/posixver.m4
+++ b/m4/posixver.m4
@@ -23,7 +23,7 @@ AC_DEFUN([gl_DEFAULT_POSIX2_VERSION],
gl_default_posix2_version=none-specified
if test -n "$ac_cv_env_DEFAULT_POSIX2_VERSION_set"; then
gl_default_posix2_version=$ac_cv_env_DEFAULT_POSIX2_VERSION_value
- AC_DEFINE_UNQUOTED(DEFAULT_POSIX2_VERSION,
+ AC_DEFINE_UNQUOTED([DEFAULT_POSIX2_VERSION],
$gl_default_posix2_version,
[Define the default level of POSIX conformance. The value is of
the form YYYYMM, specifying the year and month the standard was
diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4
index 14ba612..10d78e6 100644
--- a/m4/printf-posix.m4
+++ b/m4/printf-posix.m4
@@ -37,7 +37,7 @@ int main ()
])
case $gt_cv_func_printf_posix in
*yes)
- AC_DEFINE(HAVE_POSIX_PRINTF, 1,
+ AC_DEFINE([HAVE_POSIX_PRINTF], 1,
[Define if your printf() function supports format strings with
positions.])
;;
esac
diff --git a/m4/readline.m4 b/m4/readline.m4
index 4c82a7f..86ef424 100644
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -49,7 +49,7 @@ AC_DEFUN([gl_FUNC_READLINE],
])
if test "$gl_cv_lib_readline" != no; then
- AC_DEFINE(HAVE_READLINE, 1, [Define if you have the readline library.])
+ AC_DEFINE([HAVE_READLINE], 1, [Define if you have the readline library.])
if test "$gl_cv_lib_readline" != " -l"; then
LIBREADLINE="$LIBREADLINE$gl_cv_lib_readline"
LTLIBREADLINE="$LTLIBREADLINE$gl_cv_lib_readline"
diff --git a/m4/rename-dest-slash.m4 b/m4/rename-dest-slash.m4
index 227f237..bb4817b 100644
--- a/m4/rename-dest-slash.m4
+++ b/m4/rename-dest-slash.m4
@@ -35,7 +35,7 @@ AC_DEFUN([gl_FUNC_RENAME_TRAILING_DEST_SLASH],
])
if test $gl_cv_func_rename_trailing_dest_slash_bug = yes; then
AC_LIBOBJ(rename-dest-slash)
- AC_DEFINE(rename, rpl_rename_dest_slash,
+ AC_DEFINE([rename], rpl_rename_dest_slash,
[Define to rpl_rename_dest_slash if the replacement function should be
used.])
fi
])
diff --git a/m4/rename.m4 b/m4/rename.m4
index 39ad5e7..7b5356e 100644
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -39,9 +39,9 @@ AC_DEFUN([gl_FUNC_RENAME],
])
if test $gl_cv_func_rename_trailing_slash_bug = yes; then
AC_LIBOBJ(rename)
- AC_DEFINE(rename, rpl_rename,
+ AC_DEFINE([rename], rpl_rename,
[Define to rpl_rename if the replacement function should be used.])
- AC_DEFINE(RENAME_TRAILING_SLASH_BUG, 1,
+ AC_DEFINE([RENAME_TRAILING_SLASH_BUG], 1,
[Define if rename does not work for source file names with a trailing
slash, like the one from SunOS 4.1.1_U1.])
gl_PREREQ_RENAME
diff --git a/m4/sig_atomic_t.m4 b/m4/sig_atomic_t.m4
index a05a73b..5195a98 100644
--- a/m4/sig_atomic_t.m4
+++ b/m4/sig_atomic_t.m4
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is
preserved.
AC_DEFUN([gt_TYPE_SIG_ATOMIC_T],
[
AC_CHECK_TYPES(sig_atomic_t, ,
- [AC_DEFINE(sig_atomic_t, int,
+ [AC_DEFINE([sig_atomic_t], int,
[Define as an integer type suitable for memory locations that can be
accessed atomically even in the presence of asynchnonous signals.])],
[#include <signal.h>])
diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4
index 25d9755..206fd23 100644
--- a/m4/sockpfaf.m4
+++ b/m4/sockpfaf.m4
@@ -33,7 +33,7 @@ AC_DEFUN([gl_SOCKET_FAMILIES],
gl_cv_socket_ipv4=yes, gl_cv_socket_ipv4=no)])
AC_MSG_RESULT($gl_cv_socket_ipv4)
if test $gl_cv_socket_ipv4 = yes; then
- AC_DEFINE(HAVE_IPV4, 1, [Define to 1 if <sys/socket.h> defines AF_INET.])
+ AC_DEFINE([HAVE_IPV4], 1, [Define to 1 if <sys/socket.h> defines AF_INET.])
fi
AC_MSG_CHECKING(for IPv6 sockets)
@@ -53,6 +53,6 @@ AC_DEFUN([gl_SOCKET_FAMILIES],
gl_cv_socket_ipv6=yes, gl_cv_socket_ipv6=no)])
AC_MSG_RESULT($gl_cv_socket_ipv6)
if test $gl_cv_socket_ipv6 = yes; then
- AC_DEFINE(HAVE_IPV6, 1, [Define to 1 if <sys/socket.h> defines AF_INET6.])
+ AC_DEFINE([HAVE_IPV6], 1, [Define to 1 if <sys/socket.h> defines
AF_INET6.])
fi
])
diff --git a/m4/st_dm_mode.m4 b/m4/st_dm_mode.m4
index c1da154..ccebdfd 100644
--- a/m4/st_dm_mode.m4
+++ b/m4/st_dm_mode.m4
@@ -15,7 +15,7 @@ AC_DEFUN([AC_STRUCT_ST_DM_MODE],
ac_cv_struct_st_dm_mode=no)])
if test $ac_cv_struct_st_dm_mode = yes; then
- AC_DEFINE(HAVE_ST_DM_MODE, 1,
+ AC_DEFINE([HAVE_ST_DM_MODE], 1,
[Define if struct stat has an st_dm_mode member. ])
fi
]
diff --git a/m4/stdbool.m4 b/m4/stdbool.m4
index 2204ecd..82a0159 100644
--- a/m4/stdbool.m4
+++ b/m4/stdbool.m4
@@ -111,5 +111,5 @@ AC_DEFUN([AC_HEADER_STDBOOL],
[ac_cv_header_stdbool_h=no])])
AC_CHECK_TYPES([_Bool])
if test $ac_cv_header_stdbool_h = yes; then
- AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.])
+ AC_DEFINE([HAVE_STDBOOL_H], 1, [Define to 1 if stdbool.h conforms to
C99.])
fi])
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index db9a8ac..67e9cfd 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -19,7 +19,7 @@ AC_DEFUN([gl_AC_HEADER_STDINT_H],
gl_cv_header_stdint_h=yes,
gl_cv_header_stdint_h=no)])
if test $gl_cv_header_stdint_h = yes; then
- AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
+ AC_DEFINE_UNQUOTED([HAVE_STDINT_H_WITH_UINTMAX], 1,
[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
and declares uintmax_t. ])
fi
diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4
index 1269359..26a8896 100644
--- a/m4/stpncpy.m4
+++ b/m4/stpncpy.m4
@@ -53,7 +53,7 @@ int main () {
], gl_cv_func_stpncpy=yes, gl_cv_func_stpncpy=no)])])
if test $gl_cv_func_stpncpy = yes; then
- AC_DEFINE(HAVE_STPNCPY, 1,
+ AC_DEFINE([HAVE_STPNCPY], 1,
[Define if you have the stpncpy() function and it works.])
else
HAVE_STPNCPY=0
diff --git a/m4/strnlen.m4 b/m4/strnlen.m4
index d8307ed..e6c62c6 100644
--- a/m4/strnlen.m4
+++ b/m4/strnlen.m4
@@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_STRNLEN],
# that the above use of AC_FUNC_STRNLEN means we may have to use
# lib/strnlen.c.
#AC_LIBOBJ(strnlen)
- AC_DEFINE(strnlen, rpl_strnlen,
+ AC_DEFINE([strnlen], rpl_strnlen,
[Define to rpl_strnlen if the replacement function should be used.])
gl_PREREQ_STRNLEN
fi
diff --git a/m4/tm_gmtoff.m4 b/m4/tm_gmtoff.m4
index cb0b3c8..6877174 100644
--- a/m4/tm_gmtoff.m4
+++ b/m4/tm_gmtoff.m4
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is
preserved.
AC_DEFUN([gl_TM_GMTOFF],
[
AC_CHECK_MEMBER([struct tm.tm_gmtoff],
- [AC_DEFINE(HAVE_TM_GMTOFF, 1,
+ [AC_DEFINE([HAVE_TM_GMTOFF], 1,
[Define if struct tm has the tm_gmtoff member.])],
,
[#include <time.h>])
diff --git a/m4/tmpfile.m4 b/m4/tmpfile.m4
index 5dc24b2..f5ce567 100644
--- a/m4/tmpfile.m4
+++ b/m4/tmpfile.m4
@@ -29,7 +29,7 @@ choke me
[gl_cv_func_tmpfile_unusable=no])])
if test $gl_cv_func_tmpfile_unusable = yes; then
AC_LIBOBJ(tmpfile)
- AC_DEFINE(tmpfile, rpl_tmpfile,
+ AC_DEFINE([tmpfile], rpl_tmpfile,
[Define to rpl_tmpfile if the replacement function should be used.])
gl_PREREQ_TMPFILE
fi
diff --git a/m4/tzset.m4 b/m4/tzset.m4
index b8c111b..ad9dbc8 100644
--- a/m4/tzset.m4
+++ b/m4/tzset.m4
@@ -45,13 +45,13 @@ main ()
[gl_cv_func_tzset_clobber=yes],
[gl_cv_func_tzset_clobber=yes])])
- AC_DEFINE(HAVE_RUN_TZSET_TEST, 1,
+ AC_DEFINE([HAVE_RUN_TZSET_TEST], 1,
[Define to 1 if you have run the test for working tzset.])
if test $gl_cv_func_tzset_clobber = yes; then
gl_GETTIMEOFDAY_REPLACE_LOCALTIME
- AC_DEFINE(tzset, rpl_tzset,
+ AC_DEFINE([tzset], rpl_tzset,
[Define to rpl_tzset if the wrapper function should be used.])
AC_DEFINE([TZSET_CLOBBERS_LOCALTIME], 1,
[Define if tzset clobbers localtime's static buffer.])
diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
index 641c489..5308098 100644
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -20,11 +20,11 @@ AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
test $ac_cv_type_unsigned_long_long_int = yes \
&& ac_type='unsigned long long' \
|| ac_type='unsigned long'
- AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
+ AC_DEFINE_UNQUOTED([uintmax_t], $ac_type,
[Define to unsigned long or unsigned long long
if <stdint.h> and <inttypes.h> don't define.])
else
- AC_DEFINE(HAVE_UINTMAX_T, 1,
+ AC_DEFINE([HAVE_UINTMAX_T], 1,
[Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
fi
])
diff --git a/m4/uptime.m4 b/m4/uptime.m4
index 05c9e5f..4ddbbd4 100644
--- a/m4/uptime.m4
+++ b/m4/uptime.m4
@@ -17,7 +17,7 @@ AC_DEFUN([gl_SYS_PROC_UPTIME],
&& cat < /proc/uptime >/dev/null 2>/dev/null \
&& gl_cv_have_proc_uptime=yes])
if test $gl_cv_have_proc_uptime = yes; then
- AC_DEFINE(HAVE_PROC_UPTIME, 1,
+ AC_DEFINE([HAVE_PROC_UPTIME], 1,
[ Define if your system has the /proc/uptime special file.])
fi
])
diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4
index 9927908..2f0e93d 100644
--- a/m4/utimbuf.m4
+++ b/m4/utimbuf.m4
@@ -32,7 +32,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_UTIMBUF],
[gl_cv_sys_struct_utimbuf=no])])
if test $gl_cv_sys_struct_utimbuf = yes; then
- AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1,
+ AC_DEFINE([HAVE_STRUCT_UTIMBUF], 1,
[Define if struct utimbuf is declared -- usually in <utime.h>.
Some systems have utime.h but don't declare the struct anywhere. ])
fi
diff --git a/m4/utime.m4 b/m4/utime.m4
index 967faa2..c1a66ee 100644
--- a/m4/utime.m4
+++ b/m4/utime.m4
@@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_UTIME],
AC_REQUIRE([AC_FUNC_UTIME_NULL])
if test $ac_cv_func_utime_null = no; then
AC_LIBOBJ(utime)
- AC_DEFINE(utime, rpl_utime,
+ AC_DEFINE([utime], rpl_utime,
[Define to rpl_utime if the replacement function should be used.])
gl_PREREQ_UTIME
fi
diff --git a/m4/utimes-null.m4 b/m4/utimes-null.m4
index 8d5c8ae..e1fe03d 100644
--- a/m4/utimes-null.m4
+++ b/m4/utimes-null.m4
@@ -34,7 +34,7 @@ return ! (stat ("conftest.data", &s) == 0
rm -f core core.* *.core])
if test $ac_cv_func_utimes_null = yes; then
- AC_DEFINE(HAVE_UTIMES_NULL, 1,
+ AC_DEFINE([HAVE_UTIMES_NULL], 1,
[Define if utimes accepts a null argument])
fi
]
diff --git a/m4/vararrays.m4 b/m4/vararrays.m4
index def6ba4..166b440 100644
--- a/m4/vararrays.m4
+++ b/m4/vararrays.m4
@@ -19,7 +19,7 @@ AC_DEFUN([AC_C_VARARRAYS],
ac_cv_c_vararrays=yes,
ac_cv_c_vararrays=no)])
if test $ac_cv_c_vararrays = yes; then
- AC_DEFINE(HAVE_C_VARARRAYS, 1,
+ AC_DEFINE([HAVE_C_VARARRAYS], 1,
[Define to 1 if C supports variable-length arrays.])
fi
])
diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4
index cde2129..d4bfff1 100644
--- a/m4/wchar_t.m4
+++ b/m4/wchar_t.m4
@@ -15,6 +15,6 @@ AC_DEFUN([gt_TYPE_WCHAR_T],
wchar_t foo = (wchar_t)'\0';], ,
gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
if test $gt_cv_c_wchar_t = yes; then
- AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
+ AC_DEFINE([HAVE_WCHAR_T], 1, [Define if you have the 'wchar_t' type.])
fi
])
diff --git a/m4/wint_t.m4 b/m4/wint_t.m4
index af5ed93..2d967ad 100644
--- a/m4/wint_t.m4
+++ b/m4/wint_t.m4
@@ -23,6 +23,6 @@ AC_DEFUN([gt_TYPE_WINT_T],
wint_t foo = (wchar_t)'\0';], ,
gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
if test $gt_cv_c_wint_t = yes; then
- AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
+ AC_DEFINE([HAVE_WINT_T], 1, [Define if you have the 'wint_t' type.])
fi
])
--
1.6.1.302.gccd4d
>From 909e5e239526ed309f4b0d502288a07d63aab368 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 27 Dec 2008 20:06:54 +0100
Subject: [PATCH 2/4] m4: quote 2nd arg to AC_DEFINE
perl -pi -e 's/(AC_DEFINE.*, )(rpl_\w+),/$1\[$2\],/' m4/*.m4
---
m4/free.m4 | 2 +-
m4/getgroups.m4 | 2 +-
m4/memcmp.m4 | 2 +-
m4/mktime.m4 | 2 +-
m4/openat.m4 | 2 +-
m4/poll.m4 | 2 +-
m4/rename-dest-slash.m4 | 2 +-
m4/rename.m4 | 2 +-
m4/strnlen.m4 | 2 +-
m4/tmpfile.m4 | 2 +-
m4/tzset.m4 | 2 +-
m4/utime.m4 | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/m4/free.m4 b/m4/free.m4
index 6ed4b24..5fa79d4 100644
--- a/m4/free.m4
+++ b/m4/free.m4
@@ -31,7 +31,7 @@ AC_DEFUN([gl_FUNC_FREE],
if test $gl_cv_func_free = no; then
AC_LIBOBJ(free)
- AC_DEFINE([free], rpl_free,
+ AC_DEFINE([free], [rpl_free],
[Define to rpl_free if the replacement function should be used.])
fi
])
diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index bc1a56f..80446be 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_GETGROUPS],
AC_REQUIRE([AC_FUNC_GETGROUPS])
if test "$ac_cv_func_getgroups_works" != yes; then
AC_LIBOBJ(getgroups)
- AC_DEFINE([getgroups], rpl_getgroups,
+ AC_DEFINE([getgroups], [rpl_getgroups],
[Define as rpl_getgroups if getgroups doesn't work right.])
gl_PREREQ_GETGROUPS
fi
diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index 4f6b157..003f0f1 100644
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_MEMCMP],
AC_FUNC_MEMCMP
dnl Note: AC_FUNC_MEMCMP does AC_LIBOBJ(memcmp).
if test $ac_cv_func_memcmp_working = no; then
- AC_DEFINE([memcmp], rpl_memcmp,
+ AC_DEFINE([memcmp], [rpl_memcmp],
[Define to rpl_memcmp if the replacement function should be used.])
gl_PREREQ_MEMCMP
fi
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 261d340..e716d7b 100644
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -214,7 +214,7 @@ AC_DEFUN([gl_FUNC_MKTIME],
AC_FUNC_MKTIME
dnl Note: AC_FUNC_MKTIME does AC_LIBOBJ(mktime).
if test $ac_cv_func_working_mktime = no; then
- AC_DEFINE([mktime], rpl_mktime,
+ AC_DEFINE([mktime], [rpl_mktime],
[Define to rpl_mktime if the replacement function should be used.])
gl_PREREQ_MKTIME
fi
diff --git a/m4/openat.m4 b/m4/openat.m4
index 53d8667..c9153a9 100644
--- a/m4/openat.m4
+++ b/m4/openat.m4
@@ -80,7 +80,7 @@ AC_DEFUN([gl_FUNC_FCHOWNAT],
if test $use_replacement_fchownat = yes; then
AC_LIBOBJ(fchownat)
- AC_DEFINE([fchownat], rpl_fchownat,
+ AC_DEFINE([fchownat], [rpl_fchownat],
[Define to rpl_fchownat if the replacement function should be used.])
fi
])
diff --git a/m4/poll.m4 b/m4/poll.m4
index 424eeb6..22dc7d4 100644
--- a/m4/poll.m4
+++ b/m4/poll.m4
@@ -56,7 +56,7 @@ This is MacOSX or AIX
POLL_H=
else
AC_LIBOBJ(poll)
- AC_DEFINE([poll], rpl_poll,
+ AC_DEFINE([poll], [rpl_poll],
[Define to poll if the replacement function should be used.])
gl_PREREQ_POLL
POLL_H=poll.h
diff --git a/m4/rename-dest-slash.m4 b/m4/rename-dest-slash.m4
index bb4817b..dbcd273 100644
--- a/m4/rename-dest-slash.m4
+++ b/m4/rename-dest-slash.m4
@@ -35,7 +35,7 @@ AC_DEFUN([gl_FUNC_RENAME_TRAILING_DEST_SLASH],
])
if test $gl_cv_func_rename_trailing_dest_slash_bug = yes; then
AC_LIBOBJ(rename-dest-slash)
- AC_DEFINE([rename], rpl_rename_dest_slash,
+ AC_DEFINE([rename], [rpl_rename_dest_slash],
[Define to rpl_rename_dest_slash if the replacement function should be
used.])
fi
])
diff --git a/m4/rename.m4 b/m4/rename.m4
index 7b5356e..4cc102f 100644
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -39,7 +39,7 @@ AC_DEFUN([gl_FUNC_RENAME],
])
if test $gl_cv_func_rename_trailing_slash_bug = yes; then
AC_LIBOBJ(rename)
- AC_DEFINE([rename], rpl_rename,
+ AC_DEFINE([rename], [rpl_rename],
[Define to rpl_rename if the replacement function should be used.])
AC_DEFINE([RENAME_TRAILING_SLASH_BUG], 1,
[Define if rename does not work for source file names with a trailing
diff --git a/m4/strnlen.m4 b/m4/strnlen.m4
index e6c62c6..843dcaf 100644
--- a/m4/strnlen.m4
+++ b/m4/strnlen.m4
@@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_STRNLEN],
# that the above use of AC_FUNC_STRNLEN means we may have to use
# lib/strnlen.c.
#AC_LIBOBJ(strnlen)
- AC_DEFINE([strnlen], rpl_strnlen,
+ AC_DEFINE([strnlen], [rpl_strnlen],
[Define to rpl_strnlen if the replacement function should be used.])
gl_PREREQ_STRNLEN
fi
diff --git a/m4/tmpfile.m4 b/m4/tmpfile.m4
index f5ce567..7d7e9a3 100644
--- a/m4/tmpfile.m4
+++ b/m4/tmpfile.m4
@@ -29,7 +29,7 @@ choke me
[gl_cv_func_tmpfile_unusable=no])])
if test $gl_cv_func_tmpfile_unusable = yes; then
AC_LIBOBJ(tmpfile)
- AC_DEFINE([tmpfile], rpl_tmpfile,
+ AC_DEFINE([tmpfile], [rpl_tmpfile],
[Define to rpl_tmpfile if the replacement function should be used.])
gl_PREREQ_TMPFILE
fi
diff --git a/m4/tzset.m4 b/m4/tzset.m4
index ad9dbc8..71f7ce1 100644
--- a/m4/tzset.m4
+++ b/m4/tzset.m4
@@ -51,7 +51,7 @@ main ()
if test $gl_cv_func_tzset_clobber = yes; then
gl_GETTIMEOFDAY_REPLACE_LOCALTIME
- AC_DEFINE([tzset], rpl_tzset,
+ AC_DEFINE([tzset], [rpl_tzset],
[Define to rpl_tzset if the wrapper function should be used.])
AC_DEFINE([TZSET_CLOBBERS_LOCALTIME], 1,
[Define if tzset clobbers localtime's static buffer.])
diff --git a/m4/utime.m4 b/m4/utime.m4
index c1a66ee..37ff43c 100644
--- a/m4/utime.m4
+++ b/m4/utime.m4
@@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_UTIME],
AC_REQUIRE([AC_FUNC_UTIME_NULL])
if test $ac_cv_func_utime_null = no; then
AC_LIBOBJ(utime)
- AC_DEFINE([utime], rpl_utime,
+ AC_DEFINE([utime], [rpl_utime],
[Define to rpl_utime if the replacement function should be used.])
gl_PREREQ_UTIME
fi
--
1.6.1.302.gccd4d
>From e18dfc8bb1caf4dff57932a086abe34e462543ba Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 27 Dec 2008 20:14:58 +0100
Subject: [PATCH 3/4] m4: quote more 2nd arguments
perl -pi -e 's/(AC_DEFINE(?:_UNQUOTED)?\(.*?,) ([\$\w]\w+),/$1 [$2],/' m4/*.m4
---
m4/eaccess.m4 | 2 +-
m4/eealloc.m4 | 4 ++--
m4/iconv.m4 | 2 +-
m4/intdiv0.m4 | 2 +-
m4/intmax_t.m4 | 4 ++--
m4/mbstate_t.m4 | 2 +-
m4/mbswidth.m4 | 2 +-
m4/mmap-anon.m4 | 2 +-
m4/sig_atomic_t.m4 | 2 +-
m4/uintmax_t.m4 | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/m4/eaccess.m4 b/m4/eaccess.m4
index 9be046d..0b623bf 100644
--- a/m4/eaccess.m4
+++ b/m4/eaccess.m4
@@ -7,6 +7,6 @@ dnl with or without modifications, as long as this notice is
preserved.
AC_DEFUN([gl_FUNC_EACCESS],
[
AC_CHECK_FUNC(eaccess, ,
- [AC_DEFINE([eaccess], access,
+ [AC_DEFINE([eaccess], [access],
[Define as 'access' if you don't have the eaccess() function.])])
])
diff --git a/m4/eealloc.m4 b/m4/eealloc.m4
index adcfd06..a357066 100644
--- a/m4/eealloc.m4
+++ b/m4/eealloc.m4
@@ -16,7 +16,7 @@ AC_DEFUN([gl_EEMALLOC],
_AC_FUNC_MALLOC_IF(
[gl_cv_func_malloc_0_nonnull=1],
[gl_cv_func_malloc_0_nonnull=0])
- AC_DEFINE_UNQUOTED([MALLOC_0_IS_NONNULL], $gl_cv_func_malloc_0_nonnull,
+ AC_DEFINE_UNQUOTED([MALLOC_0_IS_NONNULL], [$gl_cv_func_malloc_0_nonnull],
[If malloc(0) is != NULL, define this to 1. Otherwise define this
to 0.])
])
@@ -26,7 +26,7 @@ AC_DEFUN([gl_EEREALLOC],
_AC_FUNC_REALLOC_IF(
[gl_cv_func_realloc_0_nonnull=1],
[gl_cv_func_realloc_0_nonnull=0])
- AC_DEFINE_UNQUOTED([REALLOC_0_IS_NONNULL], $gl_cv_func_realloc_0_nonnull,
+ AC_DEFINE_UNQUOTED([REALLOC_0_IS_NONNULL], [$gl_cv_func_realloc_0_nonnull],
[If realloc(NULL,0) is != NULL, define this to 1. Otherwise define this
to 0.])
])
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 394afd2..1125eea 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -174,7 +174,7 @@ size_t iconv();
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/(
/(/'`
AC_MSG_RESULT([$]{ac_t:-
}[$]am_cv_proto_iconv)
- AC_DEFINE_UNQUOTED([ICONV_CONST], $am_cv_proto_iconv_arg1,
+ AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
[Define as const if the declaration of iconv() needs const.])
fi
])
diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4
index ad03550..a165992 100644
--- a/m4/intdiv0.m4
+++ b/m4/intdiv0.m4
@@ -79,6 +79,6 @@ changequote([,])dnl
*yes) value=1;;
*) value=0;;
esac
- AC_DEFINE_UNQUOTED([INTDIV0_RAISES_SIGFPE], $value,
+ AC_DEFINE_UNQUOTED([INTDIV0_RAISES_SIGFPE], [$value],
[Define if integer division by zero raises signal SIGFPE.])
])
diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4
index baaf303..1065a27 100644
--- a/m4/intmax_t.m4
+++ b/m4/intmax_t.m4
@@ -22,7 +22,7 @@ AC_DEFUN([gl_AC_TYPE_INTMAX_T],
test $ac_cv_type_long_long_int = yes \
&& ac_type='long long' \
|| ac_type='long'
- AC_DEFINE_UNQUOTED([intmax_t], $ac_type,
+ AC_DEFINE_UNQUOTED([intmax_t], [$ac_type],
[Define to long or long long if <inttypes.h> and <stdint.h> don't
define.])
else
AC_DEFINE([HAVE_INTMAX_T], 1,
@@ -55,7 +55,7 @@ AC_DEFUN([gt_AC_TYPE_INTMAX_T],
test $ac_cv_type_long_long_int = yes \
&& ac_type='long long' \
|| ac_type='long'
- AC_DEFINE_UNQUOTED([intmax_t], $ac_type,
+ AC_DEFINE_UNQUOTED([intmax_t], [$ac_type],
[Define to long or long long if <stdint.h> and <inttypes.h> don't
define.])
fi
])
diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4
index d2153d9..cf5c008 100644
--- a/m4/mbstate_t.m4
+++ b/m4/mbstate_t.m4
@@ -28,7 +28,7 @@ AC_DEFUN([AC_TYPE_MBSTATE_T],
AC_DEFINE([HAVE_MBSTATE_T], 1,
[Define to 1 if <wchar.h> declares mbstate_t.])
else
- AC_DEFINE([mbstate_t], int,
+ AC_DEFINE([mbstate_t], [int],
[Define to a type if <wchar.h> does not define.])
fi
])
diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4
index 6e8da02..4a3c30c 100644
--- a/m4/mbswidth.m4
+++ b/m4/mbswidth.m4
@@ -35,7 +35,7 @@ AC_DEFUN([gl_MBSWIDTH],
else
ac_val=0
fi
- AC_DEFINE_UNQUOTED([HAVE_DECL_MBSWIDTH_IN_WCHAR_H], $ac_val,
+ AC_DEFINE_UNQUOTED([HAVE_DECL_MBSWIDTH_IN_WCHAR_H], [$ac_val],
[Define to 1 if you have a declaration of mbswidth() in <wchar.h>, and to
0 otherwise.])
AC_TYPE_MBSTATE_T
diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4
index 802a725..864ad6a 100644
--- a/m4/mmap-anon.m4
+++ b/m4/mmap-anon.m4
@@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_MMAP_ANON],
I cant identify this map.
#endif
],
- [AC_DEFINE([MAP_ANONYMOUS], MAP_ANON,
+ [AC_DEFINE([MAP_ANONYMOUS], [MAP_ANON],
[Define to a substitute value for mmap()'s MAP_ANONYMOUS flag.])
gl_have_mmap_anonymous=yes])
fi
diff --git a/m4/sig_atomic_t.m4 b/m4/sig_atomic_t.m4
index 5195a98..8f621b7 100644
--- a/m4/sig_atomic_t.m4
+++ b/m4/sig_atomic_t.m4
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is
preserved.
AC_DEFUN([gt_TYPE_SIG_ATOMIC_T],
[
AC_CHECK_TYPES(sig_atomic_t, ,
- [AC_DEFINE([sig_atomic_t], int,
+ [AC_DEFINE([sig_atomic_t], [int],
[Define as an integer type suitable for memory locations that can be
accessed atomically even in the presence of asynchnonous signals.])],
[#include <signal.h>])
diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
index 5308098..f8067f9 100644
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -20,7 +20,7 @@ AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
test $ac_cv_type_unsigned_long_long_int = yes \
&& ac_type='unsigned long long' \
|| ac_type='unsigned long'
- AC_DEFINE_UNQUOTED([uintmax_t], $ac_type,
+ AC_DEFINE_UNQUOTED([uintmax_t], [$ac_type],
[Define to unsigned long or unsigned long long
if <stdint.h> and <inttypes.h> don't define.])
else
--
1.6.1.302.gccd4d
>From e25d0a6f7bcbbd701ef2e1f0ebb7268b088ecff3 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 27 Dec 2008 22:06:07 +0100
Subject: [PATCH 4/4] m4: quote the argument to AC_LIBOBJ
perl -pi -e 's/(AC_LIBOBJ\()(\w+)\)/$1\[$2])/g' m4/*.m4
---
m4/argp.m4 | 2 +-
m4/chown.m4 | 2 +-
m4/fileblocks.m4 | 2 +-
m4/free.m4 | 2 +-
m4/fsusage.m4 | 2 +-
m4/getaddrinfo.m4 | 4 ++--
m4/getgroups.m4 | 2 +-
m4/getloadavg.m4 | 2 +-
m4/getndelim2.m4 | 2 +-
m4/getpass.m4 | 2 +-
m4/gettimeofday.m4 | 4 ++--
m4/lstat.m4 | 2 +-
m4/memcmp.m4 | 2 +-
m4/mkdir-slash.m4 | 2 +-
m4/mktime.m4 | 2 +-
m4/mountlist.m4 | 2 +-
m4/nanosleep.m4 | 2 +-
m4/openat.m4 | 2 +-
m4/poll.m4 | 2 +-
m4/posixtm.m4 | 2 +-
m4/putenv.m4 | 2 +-
m4/readline.m4 | 2 +-
m4/readlink.m4 | 2 +-
m4/rename.m4 | 2 +-
m4/strnlen.m4 | 2 +-
m4/strtod.m4 | 2 +-
m4/tmpfile.m4 | 2 +-
m4/utime.m4 | 2 +-
28 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/m4/argp.m4 b/m4/argp.m4
index 1610d71..e766c26 100644
--- a/m4/argp.m4
+++ b/m4/argp.m4
@@ -12,7 +12,7 @@ AC_DEFUN([gl_ARGP],
dnl argp-parse.c depends on GNU getopt internals, therefore use GNU getopt
dnl always.
gl_GETOPT_SUBSTITUTE
- dnl Note: gl_GETOPT_SUBSTITUTE does AC_LIBOBJ(getopt), AC_LIBOBJ(getopt1).
+ dnl Note: gl_GETOPT_SUBSTITUTE does AC_LIBOBJ([getopt]),
AC_LIBOBJ([getopt1]).
AC_CHECK_DECL([program_invocation_name],
[AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_NAME], 1,
diff --git a/m4/chown.m4 b/m4/chown.m4
index ab83f27..cbf034d 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -31,7 +31,7 @@ AC_DEFUN([gl_FUNC_CHOWN],
: # no wrapper needed
else
REPLACE_CHOWN=1
- AC_LIBOBJ(chown)
+ AC_LIBOBJ([chown])
gl_PREREQ_CHOWN
fi
])
diff --git a/m4/fileblocks.m4 b/m4/fileblocks.m4
index 5fb6311..8203c64 100644
--- a/m4/fileblocks.m4
+++ b/m4/fileblocks.m4
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is
preserved.
AC_DEFUN([gl_FILEBLOCKS],
[
AC_STRUCT_ST_BLOCKS
- dnl Note: AC_STRUCT_ST_BLOCKS does AC_LIBOBJ(fileblocks).
+ dnl Note: AC_STRUCT_ST_BLOCKS does AC_LIBOBJ([fileblocks]).
if test $ac_cv_member_struct_stat_st_blocks = no; then
gl_PREREQ_FILEBLOCKS
fi
diff --git a/m4/free.m4 b/m4/free.m4
index 5fa79d4..46eb79d 100644
--- a/m4/free.m4
+++ b/m4/free.m4
@@ -30,7 +30,7 @@ AC_DEFUN([gl_FUNC_FREE],
[gl_cv_func_free=no])])
if test $gl_cv_func_free = no; then
- AC_LIBOBJ(free)
+ AC_LIBOBJ([free])
AC_DEFINE([free], [rpl_free],
[Define to rpl_free if the replacement function should be used.])
fi
diff --git a/m4/fsusage.m4 b/m4/fsusage.m4
index 831f64f..a7df111 100644
--- a/m4/fsusage.m4
+++ b/m4/fsusage.m4
@@ -20,7 +20,7 @@ AC_DEFUN([gl_FSUSAGE],
#endif]])
gl_FILE_SYSTEM_USAGE([gl_cv_fs_space=yes], [gl_cv_fs_space=no])
if test $gl_cv_fs_space = yes; then
- AC_LIBOBJ(fsusage)
+ AC_LIBOBJ([fsusage])
gl_PREREQ_FSUSAGE_EXTRA
fi
])
diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4
index 9655a42..5c26e61 100644
--- a/m4/getaddrinfo.m4
+++ b/m4/getaddrinfo.m4
@@ -55,7 +55,7 @@ AC_DEFUN([gl_GETADDRINFO],
GETADDRINFO_LIB="-lws2_32"
LIBS="$gai_saved_LIBS $GETADDRINFO_LIB"
else
- AC_LIBOBJ(getaddrinfo)
+ AC_LIBOBJ([getaddrinfo])
fi
fi
@@ -80,7 +80,7 @@ AC_DEFUN([gl_GETADDRINFO],
[gl_cv_func_gai_strerror=yes],
[gl_cv_func_gai_strerror=no])])
if test $gl_cv_func_gai_strerror = no; then
- AC_LIBOBJ(gai_strerror)
+ AC_LIBOBJ([gai_strerror])
fi
LIBS="$gai_saved_LIBS"
diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index 80446be..77c53d7 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_GETGROUPS],
[
AC_REQUIRE([AC_FUNC_GETGROUPS])
if test "$ac_cv_func_getgroups_works" != yes; then
- AC_LIBOBJ(getgroups)
+ AC_LIBOBJ([getgroups])
AC_DEFINE([getgroups], [rpl_getgroups],
[Define as rpl_getgroups if getgroups doesn't work right.])
gl_PREREQ_GETGROUPS
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
index 923b66e..4e3dee9 100644
--- a/m4/getloadavg.m4
+++ b/m4/getloadavg.m4
@@ -132,7 +132,7 @@ AC_CHECK_DECL([getloadavg], [], [HAVE_DECL_GETLOADAVG=0],
# --------------------
# Set up the AC_LIBOBJ replacement of `getloadavg'.
AC_DEFUN([gl_PREREQ_GETLOADAVG],
-[AC_LIBOBJ(getloadavg)
+[AC_LIBOBJ([getloadavg])
AC_DEFINE([C_GETLOADAVG], 1, [Define to 1 if using `getloadavg.c'.])
# Figure out what our getloadavg.c needs.
gl_have_func=no
diff --git a/m4/getndelim2.m4 b/m4/getndelim2.m4
index 9aa89a1..12f0a5f 100644
--- a/m4/getndelim2.m4
+++ b/m4/getndelim2.m4
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is
preserved.
AC_DEFUN([gl_GETNDELIM2],
[
- AC_LIBOBJ(getndelim2)
+ AC_LIBOBJ([getndelim2])
gl_PREREQ_GETNDELIM2
AC_CHECK_FUNCS_ONCE([flockfile])
AC_CHECK_FUNCS_ONCE([funlockfile])
diff --git a/m4/getpass.m4 b/m4/getpass.m4
index 54348ce..7414fae 100644
--- a/m4/getpass.m4
+++ b/m4/getpass.m4
@@ -20,7 +20,7 @@ AC_DEFUN([gl_FUNC_GETPASS_GNU],
[
AC_CHECK_DECLS_ONCE(getpass)
dnl TODO: Detect when GNU getpass() is already found in glibc.
- AC_LIBOBJ(getpass)
+ AC_LIBOBJ([getpass])
gl_PREREQ_GETPASS
dnl We must choose a different name for our function, since on ELF systems
dnl an unusable getpass() in libc.so would override our getpass() if it is
diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
index b9bbb10..df17202 100644
--- a/m4/gettimeofday.m4
+++ b/m4/gettimeofday.m4
@@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY],
REPLACE_GETTIMEOFDAY=1
SYS_TIME_H=sys/time.h
if test $gl_cv_func_gettimeofday_clobber != yes; then
- AC_LIBOBJ(gettimeofday)
+ AC_LIBOBJ([gettimeofday])
gl_PREREQ_GETTIMEOFDAY
fi
fi
@@ -86,7 +86,7 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
])
AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [
- AC_LIBOBJ(gettimeofday)
+ AC_LIBOBJ([gettimeofday])
gl_PREREQ_GETTIMEOFDAY
AC_DEFINE([gmtime], [rpl_gmtime],
[Define to rpl_gmtime if the replacement function should be used.])
diff --git a/m4/lstat.m4 b/m4/lstat.m4
index fc222e2..7d50bd7 100644
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_LSTAT],
AC_CHECK_FUNCS_ONCE([lstat])
if test $ac_cv_func_lstat = yes; then
AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
- dnl Note: AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK does AC_LIBOBJ(lstat).
+ dnl Note: AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK does AC_LIBOBJ([lstat]).
if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
REPLACE_LSTAT=1
fi
diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index 003f0f1..2874f41 100644
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -19,7 +19,7 @@ AC_DEFUN([gl_FUNC_MEMCMP],
[ac_cv_func_memcmp_working=no])])
fi
AC_FUNC_MEMCMP
- dnl Note: AC_FUNC_MEMCMP does AC_LIBOBJ(memcmp).
+ dnl Note: AC_FUNC_MEMCMP does AC_LIBOBJ([memcmp]).
if test $ac_cv_func_memcmp_working = no; then
AC_DEFINE([memcmp], [rpl_memcmp],
[Define to rpl_memcmp if the replacement function should be used.])
diff --git a/m4/mkdir-slash.m4 b/m4/mkdir-slash.m4
index f3d8e8a..3ed3f31 100644
--- a/m4/mkdir-slash.m4
+++ b/m4/mkdir-slash.m4
@@ -39,7 +39,7 @@ AC_DEFUN([gl_FUNC_MKDIR_TRAILING_SLASH],
if test $gl_cv_func_mkdir_trailing_slash_bug = yes; then
REPLACE_MKDIR=1
- AC_LIBOBJ(mkdir)
+ AC_LIBOBJ([mkdir])
gl_PREREQ_MKDIR
fi
])
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index e716d7b..cfbef19 100644
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -212,7 +212,7 @@ fi
AC_DEFUN([gl_FUNC_MKTIME],
[
AC_FUNC_MKTIME
- dnl Note: AC_FUNC_MKTIME does AC_LIBOBJ(mktime).
+ dnl Note: AC_FUNC_MKTIME does AC_LIBOBJ([mktime]).
if test $ac_cv_func_working_mktime = no; then
AC_DEFINE([mktime], [rpl_mktime],
[Define to rpl_mktime if the replacement function should be used.])
diff --git a/m4/mountlist.m4 b/m4/mountlist.m4
index c25f44e..c9adf7d 100644
--- a/m4/mountlist.m4
+++ b/m4/mountlist.m4
@@ -9,7 +9,7 @@ AC_DEFUN([gl_MOUNTLIST],
gl_LIST_MOUNTED_FILE_SYSTEMS([gl_cv_list_mounted_fs=yes],
[gl_cv_list_mounted_fs=no])
if test $gl_cv_list_mounted_fs = yes; then
- AC_LIBOBJ(mountlist)
+ AC_LIBOBJ([mountlist])
gl_PREREQ_MOUNTLIST_EXTRA
fi
])
diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index d5248a7..b407dfa 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -100,7 +100,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
esac
done
fi
- AC_LIBOBJ(nanosleep)
+ AC_LIBOBJ([nanosleep])
gl_PREREQ_NANOSLEEP
fi
diff --git a/m4/openat.m4 b/m4/openat.m4
index c9153a9..db940e6 100644
--- a/m4/openat.m4
+++ b/m4/openat.m4
@@ -79,7 +79,7 @@ AC_DEFUN([gl_FUNC_FCHOWNAT],
fi
if test $use_replacement_fchownat = yes; then
- AC_LIBOBJ(fchownat)
+ AC_LIBOBJ([fchownat])
AC_DEFINE([fchownat], [rpl_fchownat],
[Define to rpl_fchownat if the replacement function should be used.])
fi
diff --git a/m4/poll.m4 b/m4/poll.m4
index 22dc7d4..c30a265 100644
--- a/m4/poll.m4
+++ b/m4/poll.m4
@@ -55,7 +55,7 @@ This is MacOSX or AIX
[Define to 1 if you have the 'poll' function and it works.])
POLL_H=
else
- AC_LIBOBJ(poll)
+ AC_LIBOBJ([poll])
AC_DEFINE([poll], [rpl_poll],
[Define to poll if the replacement function should be used.])
gl_PREREQ_POLL
diff --git a/m4/posixtm.m4 b/m4/posixtm.m4
index 7ace2a9..99f9289 100644
--- a/m4/posixtm.m4
+++ b/m4/posixtm.m4
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is
preserved.
AC_DEFUN([gl_POSIXTM],
[
- AC_LIBOBJ(posixtm)
+ AC_LIBOBJ([posixtm])
dnl No prerequisites of lib/posixtm.c.
])
diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 1710575..e2e2bef 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -36,6 +36,6 @@ AC_DEFUN([gl_FUNC_PUTENV],
])
if test $gl_cv_func_svid_putenv = no; then
REPLACE_PUTENV=1
- AC_LIBOBJ(putenv)
+ AC_LIBOBJ([putenv])
fi
])
diff --git a/m4/readline.m4 b/m4/readline.m4
index 86ef424..956c11c 100644
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -69,7 +69,7 @@ AC_DEFUN([gl_FUNC_READLINE],
AC_CHECK_HEADERS(readline/readline.h)
if test $gl_cv_lib_readline = no; then
- AC_LIBOBJ(readline)
+ AC_LIBOBJ([readline])
gl_PREREQ_READLINE
fi
])
diff --git a/m4/readlink.m4 b/m4/readlink.m4
index 1c347a0..069e73b 100644
--- a/m4/readlink.m4
+++ b/m4/readlink.m4
@@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_READLINK],
AC_CHECK_FUNCS_ONCE([readlink])
if test $ac_cv_func_readlink = no; then
HAVE_READLINK=0
- AC_LIBOBJ(readlink)
+ AC_LIBOBJ([readlink])
gl_PREREQ_READLINK
fi
])
diff --git a/m4/rename.m4 b/m4/rename.m4
index 4cc102f..aba4d4a 100644
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -38,7 +38,7 @@ AC_DEFUN([gl_FUNC_RENAME],
rm -rf conftest.d1 conftest.d2
])
if test $gl_cv_func_rename_trailing_slash_bug = yes; then
- AC_LIBOBJ(rename)
+ AC_LIBOBJ([rename])
AC_DEFINE([rename], [rpl_rename],
[Define to rpl_rename if the replacement function should be used.])
AC_DEFINE([RENAME_TRAILING_SLASH_BUG], 1,
diff --git a/m4/strnlen.m4 b/m4/strnlen.m4
index 843dcaf..44670da 100644
--- a/m4/strnlen.m4
+++ b/m4/strnlen.m4
@@ -20,7 +20,7 @@ AC_DEFUN([gl_FUNC_STRNLEN],
# This is necessary because automake-1.6.1 doesn't understand
# that the above use of AC_FUNC_STRNLEN means we may have to use
# lib/strnlen.c.
- #AC_LIBOBJ(strnlen)
+ #AC_LIBOBJ([strnlen])
AC_DEFINE([strnlen], [rpl_strnlen],
[Define to rpl_strnlen if the replacement function should be used.])
gl_PREREQ_STRNLEN
diff --git a/m4/strtod.m4 b/m4/strtod.m4
index 5d52617..3d3348f 100644
--- a/m4/strtod.m4
+++ b/m4/strtod.m4
@@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_STRTOD],
[
AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
AC_FUNC_STRTOD
- dnl Note: AC_FUNC_STRTOD does AC_LIBOBJ(strtod).
+ dnl Note: AC_FUNC_STRTOD does AC_LIBOBJ([strtod]).
if test $ac_cv_func_strtod = no; then
HAVE_STRTOD=0
REPLACE_STRTOD=1
diff --git a/m4/tmpfile.m4 b/m4/tmpfile.m4
index 7d7e9a3..9a5416f 100644
--- a/m4/tmpfile.m4
+++ b/m4/tmpfile.m4
@@ -28,7 +28,7 @@ choke me
[gl_cv_func_tmpfile_unusable=yes],
[gl_cv_func_tmpfile_unusable=no])])
if test $gl_cv_func_tmpfile_unusable = yes; then
- AC_LIBOBJ(tmpfile)
+ AC_LIBOBJ([tmpfile])
AC_DEFINE([tmpfile], [rpl_tmpfile],
[Define to rpl_tmpfile if the replacement function should be used.])
gl_PREREQ_TMPFILE
diff --git a/m4/utime.m4 b/m4/utime.m4
index 37ff43c..a386ad6 100644
--- a/m4/utime.m4
+++ b/m4/utime.m4
@@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_UTIME],
[
AC_REQUIRE([AC_FUNC_UTIME_NULL])
if test $ac_cv_func_utime_null = no; then
- AC_LIBOBJ(utime)
+ AC_LIBOBJ([utime])
AC_DEFINE([utime], [rpl_utime],
[Define to rpl_utime if the replacement function should be used.])
gl_PREREQ_UTIME
--
1.6.1.302.gccd4d
- m4 quoting improvements,
Jim Meyering <=