Use AC_REPLACE_FUNCS.

CVS patchset: 2423
CVS date: 1998/10/08 12:44:39

diff --git a/configure.in b/configure.in
index c685652..5748a68 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -377,17 +377,6 @@ AC_CHECK_HEADERS(sys/mount.h sys/mntctl.h sys/vmount.h)
 AC_CHECK_HEADERS(fcntl.h grp.h malloc.h memory.h netdb.h pwd.h utime.h)
 AC_CHECK_HEADERS(sys/mman.h sys/param.h sys/resource.h sys/utsname.h sys/wait.h)
 
-# solaris2.4 and sinix 5.42 have broken fnmatch. get glob also to be safe.
-case $target in
-    *-*-solaris2.4|mips-sni-sysv4*) 
-       LIBOBJS="$LIBOBJS glob.o fnmatch.o"
-       ;;
-    *)
-       AC_CHECK_HEADERS(glob.h,,LIBOBJS="$LIBOBJS glob.o")
-       AC_CHECK_HEADERS(fnmatch.h,,LIBOBJS="$LIBOBJS fnmatch.o")
-       ;;
-esac
-
 AC_CHECK_HEADERS(db_185.h)
 
 if test "$PO" = po; then
@@ -446,11 +435,11 @@ AC_TYPE_PID_T
 dnl Checks for library functions.
 AC_FUNC_ALLOCA
 
-dnl XXX AC_FUNC_FNMATCH
-dnl XXX if test $ac_cv_func_fnmatch_works = no; then
-dnl XXX   LIBOBJS="$LIBOBJS fnmatch.o"
-dnl XXX   AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch)
-dnl XXX fi
+AC_FUNC_FNMATCH
+if test $ac_cv_func_fnmatch_works = no; then
+   LIBOBJS="$LIBOBJS fnmatch.o"
+   AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch)
+fi
 
 dnl XXX AC_FUNC_MEMCMP
 dnl XXX AC_FUNC_MMAP
@@ -462,20 +451,14 @@ dnl XXX AC_FUNC_VFORK
 dnl XXX AC_FUNC_VPRINTF
 dnl XXX AC_CHECK_FUNCS(gethostname lchown mkdir mkfifo rmdir select uname)
 
-dnl XXX AC_REPLACE_FUNCS(getcwd getwd glob inet_aton putenv realpath strdup strerror strtol strtoul strspn strstr)
+AC_REPLACE_FUNCS(getcwd getwd glob inet_aton putenv realpath strdup strerror strtol strtoul strspn strstr)
 
-AC_CHECK_FUNC(inet_aton, AC_DEFINE(HAVE_INET_ATON), LIBOBJS="$LIBOBJS inet_aton.o")
-AC_CHECK_FUNC(realpath, AC_DEFINE(HAVE_REALPATH), LIBOBJS="$LIBOBJS realpath.o")
 AC_CHECK_FUNC(getmntent, AC_DEFINE(HAVE_GETMNTENT), [
   AC_CHECK_FUNC(mntctl, AC_DEFINE(HAVE_MNTCTL),[
     AC_CHECK_FUNC(getmntinfo_r, AC_DEFINE(HAVE_GETMNTINFO_R), [
       AC_CHECK_LIB(c_r, getmntinfo_r, [LIBS="$LIBS -lc_r"; 
                                        AC_DEFINE(HAVE_GETMNTINFO_R)],
                  LIBOBJS="$LIBOBJS getmntent.o")])])])
-AC_CHECK_FUNC(strerror, [], LIBOBJS="$LIBOBJS strerror.o")
-AC_CHECK_FUNC(strtol, [], LIBOBJS="$LIBOBJS strtol.o")
-AC_CHECK_FUNC(strtoul, [], LIBOBJS="$LIBOBJS strtoul.o")
-AC_CHECK_FUNC(strdup, [], LIBOBJS="$LIBOBJS strdup.o")
 LCHOWN=no
 AC_CHECK_FUNC(lchown, [LCHOWN=yes; AC_DEFINE(HAVE_LCHOWN)])
 

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 7046384..31f0bf9 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -150,18 +150,20 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 HEADERS =  $(noinst_HEADERS)
 
-DIST_COMMON =  Makefile.am Makefile.in alloca.c fnmatch.c getmntent.c \
-glob.c inet_aton.c myrealloc.c realpath.c strdup.c strerror.c strtol.c \
-strtoul.c
+DIST_COMMON =  Makefile.am Makefile.in alloca.c fnmatch.c getcwd.c \
+getmntent.c getwd.c glob.c inet_aton.c myrealloc.c putenv.c realpath.c \
+strdup.c strerror.c strspn.c strstr.c strtol.c strtoul.c
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP = --best
-DEP_FILES =  .deps/alloca.P .deps/fnmatch.P .deps/getmntent.P \
-.deps/glob.P .deps/inet_aton.P .deps/myrealloc.P .deps/realpath.P \
-.deps/strdup.P .deps/strerror.P .deps/strtol.P .deps/strtoul.P
+DEP_FILES =  .deps/alloca.P .deps/fnmatch.P .deps/getcwd.P \
+.deps/getmntent.P .deps/getwd.P .deps/glob.P .deps/inet_aton.P \
+.deps/myrealloc.P .deps/putenv.P .deps/realpath.P .deps/strdup.P \
+.deps/strerror.P .deps/strspn.P .deps/strstr.P .deps/strtol.P \
+.deps/strtoul.P
 SOURCES = $(libmisc_a_SOURCES)
 OBJECTS = $(libmisc_a_OBJECTS)