From 6fe8d7498529e40705598c70355fd2f38efc7aea Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 17 Sep 2001 21:44:03 +0000 Subject: [PATCH] Use AC_DEFINE rather than AC_DEFINE_UNQUOTED, whenever the right hand side need not be expanded by the shell. --- m4/chown.m4 | 2 +- m4/fstypename.m4 | 4 ++-- m4/getgroups.m4 | 2 +- m4/gettimeofday.m4 | 2 +- m4/jm-mktime.m4 | 2 +- m4/lstat.m4 | 2 +- m4/malloc.m4 | 6 +++--- m4/memcmp.m4 | 2 +- m4/mkdir-slash.m4 | 2 +- m4/nanosleep.m4 | 2 +- m4/putenv.m4 | 2 +- m4/readdir.m4 | 2 +- m4/realloc.m4 | 6 +++--- m4/rename.m4 | 2 +- m4/st_dm_mode.m4 | 4 ++-- m4/stat.m4 | 2 +- m4/strerror_r.m4 | 2 +- m4/timespec.m4 | 4 ++-- m4/utimbuf.m4 | 2 +- m4/utimes.m4 | 4 ++-- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/m4/chown.m4 b/m4/chown.m4 index 334f1b779..1f3f51b46 100644 --- a/m4/chown.m4 +++ b/m4/chown.m4 @@ -43,7 +43,7 @@ AC_DEFUN([jm_FUNC_CHOWN], ]) if test $jm_cv_func_working_chown = no; then AC_LIBOBJ(chown) - AC_DEFINE_UNQUOTED(chown, rpl_chown, + AC_DEFINE(chown, rpl_chown, [Define to rpl_chown if the replacement function should be used.]) fi ]) diff --git a/m4/fstypename.m4 b/m4/fstypename.m4 index fdf49481b..75723a14f 100644 --- a/m4/fstypename.m4 +++ b/m4/fstypename.m4 @@ -25,8 +25,8 @@ AC_DEFUN([jm_FSTYPENAME], ) if test $fu_cv_sys_f_fstypename_in_statfs = yes; then - AC_DEFINE_UNQUOTED(HAVE_F_FSTYPENAME_IN_STATFS, 1, - [Define if struct statfs has the f_fstypename member.]) + AC_DEFINE(HAVE_F_FSTYPENAME_IN_STATFS, 1, + [Define if struct statfs has the f_fstypename member.]) fi ] ) diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 index 8f3b6c9e5..e0f3359b0 100644 --- a/m4/getgroups.m4 +++ b/m4/getgroups.m4 @@ -39,7 +39,7 @@ AC_DEFUN([jm_FUNC_GETGROUPS], ]) if test $jm_cv_func_working_getgroups = no; then AC_LIBOBJ(getgroups) - AC_DEFINE_UNQUOTED(getgroups, rpl_getgroups, + AC_DEFINE(getgroups, rpl_getgroups, [Define as rpl_getgroups if getgroups doesn't work right.]) fi fi diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index 3e2baa1ea..895f89269 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -59,7 +59,7 @@ main () ]) if test $jm_cv_func_gettimeofday_clobber = yes; then AC_LIBOBJ(gettimeofday) - AC_DEFINE_UNQUOTED(gettimeofday, rpl_gettimeofday, + AC_DEFINE(gettimeofday, rpl_gettimeofday, [Define to rpl_gettimeofday if the replacement function should be used.]) AC_DEFINE(GETTIMEOFDAY_CLOBBERS_LOCALTIME_BUFFER, 1, [Define if gettimeofday clobbers localtime's static buffer.]) diff --git a/m4/jm-mktime.m4 b/m4/jm-mktime.m4 index 63e7cef84..d687c999a 100644 --- a/m4/jm-mktime.m4 +++ b/m4/jm-mktime.m4 @@ -10,7 +10,7 @@ AC_DEFUN([jm_FUNC_MKTIME], AC_CHECK_FUNCS(localtime_r) if test $ac_cv_func_working_mktime = no; then - AC_DEFINE_UNQUOTED(mktime, rpl_mktime, + AC_DEFINE(mktime, rpl_mktime, [Define to rpl_mktime if the replacement function should be used.]) fi ]) diff --git a/m4/lstat.m4 b/m4/lstat.m4 index c2e6ca13f..8ef73b322 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -32,7 +32,7 @@ AC_DEFUN([jm_FUNC_LSTAT], ]) if test $jm_cv_func_lstat_empty_string_bug = yes; then AC_LIBOBJ(lstat) - AC_DEFINE_UNQUOTED(HAVE_LSTAT_EMPTY_STRING_BUG, 1, + AC_DEFINE(HAVE_LSTAT_EMPTY_STRING_BUG, 1, [Define if lstat has the bug that it succeeds when given the zero-length file name argument. The lstat from SunOS4.1.4 and the Hurd as of 1998-11-01) do this. ]) diff --git a/m4/malloc.m4 b/m4/malloc.m4 index 05c66ad6a..bb60947dc 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -9,8 +9,8 @@ AC_DEFUN([jm_FUNC_MALLOC], [ dnl xmalloc.c requires that this symbol be defined so it doesn't dnl mistakenly use a broken malloc -- as it might if this test were omitted. - AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_MALLOC_CHECK, 1, - [Define if the malloc check has been performed. ]) + AC_DEFINE(HAVE_DONE_WORKING_MALLOC_CHECK, 1, + [Define if the malloc check has been performed. ]) AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc, [AC_TRY_RUN([ @@ -28,7 +28,7 @@ AC_DEFUN([jm_FUNC_MALLOC], ]) if test $jm_cv_func_working_malloc = no; then AC_LIBOBJ(malloc) - AC_DEFINE_UNQUOTED(malloc, rpl_malloc, + AC_DEFINE(malloc, rpl_malloc, [Define to rpl_malloc if the replacement function should be used.]) fi ]) diff --git a/m4/memcmp.m4 b/m4/memcmp.m4 index f1d7a88e1..1de340938 100644 --- a/m4/memcmp.m4 +++ b/m4/memcmp.m4 @@ -3,7 +3,7 @@ AC_DEFUN([jm_FUNC_MEMCMP], [AC_REQUIRE([AC_FUNC_MEMCMP])dnl if test $ac_cv_func_memcmp_working = no; then - AC_DEFINE_UNQUOTED(memcmp, rpl_memcmp, + AC_DEFINE(memcmp, rpl_memcmp, [Define to rpl_memcmp if the replacement function should be used.]) fi ]) diff --git a/m4/mkdir-slash.m4 b/m4/mkdir-slash.m4 index 8245d8870..18f835a9d 100644 --- a/m4/mkdir-slash.m4 +++ b/m4/mkdir-slash.m4 @@ -29,7 +29,7 @@ AC_DEFUN([UTILS_FUNC_MKDIR_TRAILING_SLASH], if test $utils_cv_func_mkdir_trailing_slash_bug = yes; then AC_LIBOBJ(mkdir) - AC_DEFINE_UNQUOTED(mkdir, rpl_mkdir, + AC_DEFINE(mkdir, rpl_mkdir, [Define to rpl_mkdir if the replacement function should be used.]) fi ]) diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4 index 2e0b97199..b431456c7 100644 --- a/m4/nanosleep.m4 +++ b/m4/nanosleep.m4 @@ -46,7 +46,7 @@ AC_DEFUN([jm_FUNC_NANOSLEEP], ]) if test $jm_cv_func_nanosleep_works = no; then AC_LIBOBJ(nanosleep) - AC_DEFINE_UNQUOTED(nanosleep, rpl_nanosleep, + AC_DEFINE(nanosleep, rpl_nanosleep, [Define to rpl_nanosleep if the replacement function should be used.]) fi diff --git a/m4/putenv.m4 b/m4/putenv.m4 index eb6ef5f93..39a6e7568 100644 --- a/m4/putenv.m4 +++ b/m4/putenv.m4 @@ -34,7 +34,7 @@ AC_DEFUN([jm_FUNC_PUTENV], ]) if test $jm_cv_func_svid_putenv = no; then AC_LIBOBJ(putenv) - AC_DEFINE_UNQUOTED(putenv, rpl_putenv, + AC_DEFINE(putenv, rpl_putenv, [Define to rpl_putenv if the replacement function should be used.]) fi ]) diff --git a/m4/readdir.m4 b/m4/readdir.m4 index 6087602c4..fc1dcacd0 100644 --- a/m4/readdir.m4 +++ b/m4/readdir.m4 @@ -123,7 +123,7 @@ AC_CACHE_CHECK([for working readdir], jm_cv_func_working_readdir, jm_cv_func_working_readdir=no)]) if test $jm_cv_func_working_readdir = yes; then - AC_DEFINE_UNQUOTED(HAVE_WORKING_READDIR, 1, + AC_DEFINE(HAVE_WORKING_READDIR, 1, [Define if readdir is found to work properly in some unusual cases. ]) fi ]) diff --git a/m4/realloc.m4 b/m4/realloc.m4 index ff8314dd4..c8a823747 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -9,8 +9,8 @@ AC_DEFUN([jm_FUNC_REALLOC], [ dnl xmalloc.c requires that this symbol be defined so it doesn't dnl mistakenly use a broken realloc -- as it might if this test were omitted. - AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_REALLOC_CHECK, 1, - [Define if the realloc check has been performed. ]) + AC_DEFINE(HAVE_DONE_WORKING_REALLOC_CHECK, 1, + [Define if the realloc check has been performed. ]) AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc, [AC_TRY_RUN([ @@ -28,7 +28,7 @@ AC_DEFUN([jm_FUNC_REALLOC], ]) if test $jm_cv_func_working_realloc = no; then AC_LIBOBJ(realloc) - AC_DEFINE_UNQUOTED(realloc, rpl_realloc, + AC_DEFINE(realloc, rpl_realloc, [Define to rpl_realloc if the replacement function should be used.]) fi ]) diff --git a/m4/rename.m4 b/m4/rename.m4 index 41359ce0f..4ce7f472d 100644 --- a/m4/rename.m4 +++ b/m4/rename.m4 @@ -33,7 +33,7 @@ AC_DEFUN([vb_FUNC_RENAME], ]) if test $vb_cv_func_rename_trailing_slash_bug = yes; then AC_LIBOBJ(rename) - AC_DEFINE_UNQUOTED(RENAME_TRAILING_SLASH_BUG, 1, + AC_DEFINE(RENAME_TRAILING_SLASH_BUG, 1, [Define if rename does not work for source paths with a trailing slash, like the one from SunOS 4.1.1_U1.]) fi diff --git a/m4/st_dm_mode.m4 b/m4/st_dm_mode.m4 index bd22665a2..ef5232eff 100644 --- a/m4/st_dm_mode.m4 +++ b/m4/st_dm_mode.m4 @@ -10,8 +10,8 @@ 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_UNQUOTED(HAVE_ST_DM_MODE, 1, - [Define if struct stat has an st_dm_mode member. ]) + AC_DEFINE(HAVE_ST_DM_MODE, 1, + [Define if struct stat has an st_dm_mode member. ]) fi ] ) diff --git a/m4/stat.m4 b/m4/stat.m4 index 3bc732d6f..1469ecf19 100644 --- a/m4/stat.m4 +++ b/m4/stat.m4 @@ -32,7 +32,7 @@ AC_DEFUN([jm_FUNC_STAT], ]) if test $jm_cv_func_stat_empty_string_bug = yes; then AC_LIBOBJ(stat) - AC_DEFINE_UNQUOTED(HAVE_STAT_EMPTY_STRING_BUG, 1, + AC_DEFINE(HAVE_STAT_EMPTY_STRING_BUG, 1, [Define if stat has the bug that it succeeds when given the zero-length file name argument. The stat from SunOS4.1.4 and the Hurd as of 1998-11-01) do this. ]) diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4 index 6cf46240a..47e550791 100644 --- a/m4/strerror_r.m4 +++ b/m4/strerror_r.m4 @@ -59,7 +59,7 @@ if test $ac_cv_func_strerror_r = yes; then fi ]) if test $ac_cv_func_strerror_r_works = yes; then - AC_DEFINE_UNQUOTED(HAVE_WORKING_STRERROR_R, 1, + AC_DEFINE(HAVE_WORKING_STRERROR_R, 1, [Define to 1 if `strerror_r' returns a string.]) fi fi diff --git a/m4/timespec.m4 b/m4/timespec.m4 index 4d547cf26..5edb554db 100644 --- a/m4/timespec.m4 +++ b/m4/timespec.m4 @@ -28,7 +28,7 @@ AC_DEFUN([jm_CHECK_TYPE_STRUCT_TIMESPEC], ]) if test $fu_cv_sys_struct_timespec = yes; then - AC_DEFINE_UNQUOTED(HAVE_STRUCT_TIMESPEC, 1, - [Define if struct timespec is declared in . ]) + AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1, + [Define if struct timespec is declared in . ]) fi ]) diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4 index 7c82f19e0..4ea49523e 100644 --- a/m4/utimbuf.m4 +++ b/m4/utimbuf.m4 @@ -33,7 +33,7 @@ AC_DEFUN([jm_CHECK_TYPE_STRUCT_UTIMBUF], ]) if test $fu_cv_sys_struct_utimbuf = yes; then - AC_DEFINE_UNQUOTED(HAVE_STRUCT_UTIMBUF, 1, + AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, [Define if struct utimbuf is declared -- usually in . Some systems have utime.h but don't declare the struct anywhere. ]) fi diff --git a/m4/utimes.m4 b/m4/utimes.m4 index 0f70ee3cc..f7e7842c5 100644 --- a/m4/utimes.m4 +++ b/m4/utimes.m4 @@ -25,8 +25,8 @@ exit(!(stat ("conftest.data", &s) == 0 rm -f core core.* *.core]) if test $ac_cv_func_utimes_null = yes; then - AC_DEFINE_UNQUOTED(HAVE_UTIMES_NULL, 1, - [Define if utimes accepts a null argument]) + AC_DEFINE(HAVE_UTIMES_NULL, 1, + [Define if utimes accepts a null argument]) fi ] ) -- 2.11.0