From a965c0038c4b72af2497d3ec44aeb4587c2478d5 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 2 Jul 2000 12:58:27 +0000 Subject: [PATCH] Replace each use of AC_SUBST(LIBOBJS)/LIBOBJS=... with AC_LIBOBJ([function_name]). --- m4/ChangeLog | 5 +++++ m4/chown.m4 | 5 ++--- m4/fnmatch.m4 | 5 ++--- m4/ftruncate.m4 | 4 ++-- m4/getgroups.m4 | 5 ++--- m4/getline.m4 | 5 ++--- m4/group-member.m4 | 5 ++--- m4/jm-macros.m4 | 6 +++--- m4/lstat.m4 | 5 ++--- m4/malloc.m4 | 5 ++--- m4/memcmp.m4 | 5 ++--- m4/nanosleep.m4 | 5 ++--- m4/putenv.m4 | 5 ++--- m4/realloc.m4 | 5 ++--- m4/regex.m4 | 5 ++--- m4/stat.m4 | 5 ++--- m4/strftime.m4 | 5 ++--- 17 files changed, 38 insertions(+), 47 deletions(-) diff --git a/m4/ChangeLog b/m4/ChangeLog index ed6970c5b..b60582180 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2000-07-02 Jim Meyering + + * chown.m4: Replace each use of AC_SUBST(LIBOBJS)/LIBOBJS=... with + AC_LIBOBJ([function_name]). + 2000-07-01 Jim Meyering * ls-mntd-fs.m4: Remove a `FIXME' comment and fix the associated diff --git a/m4/chown.m4 b/m4/chown.m4 index deae13b41..3c6c04288 100644 --- a/m4/chown.m4 +++ b/m4/chown.m4 @@ -1,4 +1,4 @@ -#serial 4 +#serial 5 dnl From Jim Meyering. dnl Determine whether chown accepts arguments of -1 for uid and gid. @@ -42,8 +42,7 @@ AC_DEFUN(jm_FUNC_CHOWN, jm_cv_func_working_chown=no) ]) if test $jm_cv_func_working_chown = no; then - AC_SUBST(LIBOBJS) - LIBOBJS="$LIBOBJS chown.$ac_objext" + AC_LIBOBJ([chown]) AC_DEFINE_UNQUOTED(chown, rpl_chown, [Define to rpl_chown if the replacement function should be used.]) fi diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 index c560fd2fa..e5290b7f7 100644 --- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -1,4 +1,4 @@ -#serial 2 +#serial 3 dnl Determine whether to add fnmatch.o to LIBOBJS and to dnl define fnmatch to rpl_fnmatch. @@ -10,8 +10,7 @@ AC_DEFUN(jm_FUNC_FNMATCH, AC_FUNC_FNMATCH if test $ac_cv_func_fnmatch_works = no \ && test $ac_cv_gnu_library = no; then - AC_SUBST(LIBOBJS) - LIBOBJS="$LIBOBJS fnmatch.$ac_objext" + AC_LIBOBJ([fnmatch]) AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch, [Define to rpl_fnmatch if the replacement function should be used.]) fi diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4 index bcb4ba1ed..473fde210 100644 --- a/m4/ftruncate.m4 +++ b/m4/ftruncate.m4 @@ -1,4 +1,4 @@ -#serial 1 +#serial 2 # See if we need to emulate a missing ftruncate function using fcntl. @@ -21,7 +21,7 @@ AC_DEFUN(jm_FUNC_FTRUNCATE, fu_cv_sys_ftruncate_emulation=no)]) AC_MSG_RESULT($fu_cv_sys_ftruncate_emulation) if test $fu_cv_sys_ftruncate_emulation = yes; then - LIBOBJS="$LIBOBJS ftruncate.$ac_objext" + AC_LIBOBJ([ftruncate]) fi fi ]) diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 index 15f7abcaf..4e187016a 100644 --- a/m4/getgroups.m4 +++ b/m4/getgroups.m4 @@ -1,4 +1,4 @@ -#serial 3 +#serial 4 dnl From Jim Meyering. dnl @@ -38,8 +38,7 @@ AC_DEFUN(jm_FUNC_GETGROUPS, jm_cv_func_working_getgroups=no) ]) if test $jm_cv_func_working_getgroups = no; then - AC_SUBST(LIBOBJS) - LIBOBJS="$LIBOBJS getgroups.$ac_objext" + AC_LIBOBJ([getgroups]) AC_DEFINE_UNQUOTED(getgroups, rpl_getgroups, [Define as rpl_getgroups if getgroups doesn't work right.]) fi diff --git a/m4/getline.m4 b/m4/getline.m4 index 697a82ee4..dd8b60254 100644 --- a/m4/getline.m4 +++ b/m4/getline.m4 @@ -1,4 +1,4 @@ -#serial 3 +#serial 4 dnl See if there's a working, system-supplied version of the getline function. dnl We can't just do AC_REPLACE_FUNCS(getline) because some systems @@ -39,7 +39,6 @@ AC_DEFUN(AM_FUNC_GETLINE, fi if test $am_cv_func_working_getline = no; then - LIBOBJS="$LIBOBJS getline.$ac_objext" - AC_SUBST(LIBOBJS)dnl + AC_LIBOBJ([getline]) fi ]) diff --git a/m4/group-member.m4 b/m4/group-member.m4 index bdfdec42e..6adc6fa63 100644 --- a/m4/group-member.m4 +++ b/m4/group-member.m4 @@ -1,4 +1,4 @@ -#serial 1 +#serial 2 dnl Written by Jim Meyering @@ -6,7 +6,6 @@ AC_DEFUN(jm_FUNC_GROUP_MEMBER, [ dnl Do this replacement check manually because I want the hyphen dnl (not the underscore) in the filename. - AC_CHECK_FUNC(group_member, , [LIBOBJS="$LIBOBJS group-member.$ac_objext"]) - AC_SUBST(LIBOBJS) + AC_CHECK_FUNC(group_member, , [AC_LIBOBJ([group-member])]) ] ) diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4 index cbe58ef1a..9e260278d 100644 --- a/m4/jm-macros.m4 +++ b/m4/jm-macros.m4 @@ -1,4 +1,4 @@ -#serial 22 +#serial 23 dnl Misc type-related macros for fileutils, sh-utils, textutils. @@ -198,8 +198,8 @@ AC_DEFUN(jm_MACROS, jm_FILE_SYSTEM_USAGE([space=yes], [space=no]) if test $list_mounted_fs = yes && test $space = yes; then DF_PROG="df" - LIBOBJS="$LIBOBJS fsusage.$ac_objext" - LIBOBJS="$LIBOBJS mountlist.$ac_objext" + AC_LIBOBJ([fsusage]) + AC_LIBOBJ([mountlist]) fi ]) diff --git a/m4/lstat.m4 b/m4/lstat.m4 index a5261e2d6..e93beef3f 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,4 +1,4 @@ -#serial 5 +#serial 6 dnl From Jim Meyering. dnl Determine whether lstat has the bug that it succeeds when given the @@ -31,8 +31,7 @@ AC_DEFUN(jm_FUNC_LSTAT, jm_cv_func_lstat_empty_string_bug=yes) ]) if test $jm_cv_func_lstat_empty_string_bug = yes; then - AC_SUBST(LIBOBJS) - LIBOBJS="$LIBOBJS lstat.$ac_objext" + AC_LIBOBJ([lstat]) AC_DEFINE_UNQUOTED(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) diff --git a/m4/malloc.m4 b/m4/malloc.m4 index 4978eaf6b..5d8eab10c 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,4 +1,4 @@ -#serial 3 +#serial 4 dnl From Jim Meyering. dnl Determine whether malloc accepts 0 as its argument. @@ -27,8 +27,7 @@ AC_DEFUN(jm_FUNC_MALLOC, jm_cv_func_working_malloc=no) ]) if test $jm_cv_func_working_malloc = no; then - AC_SUBST(LIBOBJS) - LIBOBJS="$LIBOBJS malloc.$ac_objext" + AC_LIBOBJ([malloc]) AC_DEFINE_UNQUOTED(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 7fdfe9ad7..2d9258165 100644 --- a/m4/memcmp.m4 +++ b/m4/memcmp.m4 @@ -1,4 +1,4 @@ -#serial 4 +#serial 5 dnl A replacement for autoconf's AC_FUNC_MEMCMP that detects dnl the losing memcmp on some x86 Next systems. @@ -36,8 +36,7 @@ main () jm_cv_func_memcmp_working=no, jm_cv_func_memcmp_working=no)]) test $jm_cv_func_memcmp_working = no \ - && LIBOBJS="$LIBOBJS memcmp.$ac_objext" -AC_SUBST(LIBOBJS)dnl + && AC_LIBOBJ([memcmp]) ]) AC_DEFUN(jm_FUNC_MEMCMP, diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4 index 5ed4c4727..43df207cf 100644 --- a/m4/nanosleep.m4 +++ b/m4/nanosleep.m4 @@ -1,4 +1,4 @@ -#serial 6 +#serial 7 dnl From Jim Meyering. dnl Check for the nanosleep function. @@ -45,8 +45,7 @@ AC_DEFUN(jm_FUNC_NANOSLEEP, jm_cv_func_nanosleep_works=no) ]) if test $jm_cv_func_nanosleep_works = no; then - AC_SUBST(LIBOBJS) - LIBOBJS="$LIBOBJS nanosleep.$ac_objext" + AC_LIBOBJ([nanosleep]) AC_DEFINE_UNQUOTED(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 f9fcc8cd8..d674eb754 100644 --- a/m4/putenv.m4 +++ b/m4/putenv.m4 @@ -1,4 +1,4 @@ -#serial 3 +#serial 4 dnl From Jim Meyering. dnl @@ -33,8 +33,7 @@ AC_DEFUN(jm_FUNC_PUTENV, jm_cv_func_svid_putenv=no) ]) if test $jm_cv_func_svid_putenv = no; then - AC_SUBST(LIBOBJS) - LIBOBJS="$LIBOBJS putenv.$ac_objext" + AC_LIBOBJ([putenv]) AC_DEFINE_UNQUOTED(putenv, rpl_putenv, [Define to rpl_putenv if the replacement function should be used.]) fi diff --git a/m4/realloc.m4 b/m4/realloc.m4 index bfbef0c16..7e5ca73cd 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -1,4 +1,4 @@ -#serial 3 +#serial 4 dnl From Jim Meyering. dnl Determine whether realloc works when both arguments are 0. @@ -27,8 +27,7 @@ AC_DEFUN(jm_FUNC_REALLOC, jm_cv_func_working_realloc=no) ]) if test $jm_cv_func_working_realloc = no; then - AC_SUBST(LIBOBJS) - LIBOBJS="$LIBOBJS realloc.$ac_objext" + AC_LIBOBJ([realloc]) AC_DEFINE_UNQUOTED(realloc, rpl_realloc, [Define to rpl_realloc if the replacement function should be used.]) fi diff --git a/m4/regex.m4 b/m4/regex.m4 index c8194b214..050ff9936 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,4 +1,4 @@ -#serial 7 +#serial 8 dnl Initially derived from code in GNU grep. dnl Mostly written by Jim Meyering. @@ -62,8 +62,7 @@ AC_DEFUN(jm_INCLUDED_REGEX, jm_with_regex=$withval, jm_with_regex=$ac_use_included_regex) if test "$jm_with_regex" = yes; then - AC_SUBST(LIBOBJS) - LIBOBJS="$LIBOBJS regex.$ac_objext" + AC_LIBOBJ([regex]) fi ], ) diff --git a/m4/stat.m4 b/m4/stat.m4 index d2e95f875..87d3e540d 100644 --- a/m4/stat.m4 +++ b/m4/stat.m4 @@ -1,4 +1,4 @@ -#serial 5 +#serial 6 dnl From Jim Meyering. dnl Determine whether stat has the bug that it succeeds when given the @@ -31,8 +31,7 @@ AC_DEFUN(jm_FUNC_STAT, jm_cv_func_stat_empty_string_bug=yes) ]) if test $jm_cv_func_stat_empty_string_bug = yes; then - AC_SUBST(LIBOBJS) - LIBOBJS="$LIBOBJS stat.$ac_objext" + AC_LIBOBJ([stat]) AC_DEFINE_UNQUOTED(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) diff --git a/m4/strftime.m4 b/m4/strftime.m4 index fa952f495..c4ae25963 100644 --- a/m4/strftime.m4 +++ b/m4/strftime.m4 @@ -1,4 +1,4 @@ -#serial 14 +#serial 15 dnl This macro is intended to be used solely in this file. dnl These are the prerequisite macros for GNU's strftime.c replacement. @@ -146,8 +146,7 @@ main () jm_cv_func_working_gnu_strftime=no) ]) if test $jm_cv_func_working_gnu_strftime = no; then - AC_SUBST(LIBOBJS) - LIBOBJS="$LIBOBJS strftime.$ac_objext" + AC_LIBOBJ([strftime]) AC_DEFINE_UNQUOTED(strftime, gnu_strftime, [Define to gnu_strftime if the replacement function should be used.]) fi -- 2.11.0