From 84de058b96e30be21d606c4fbc14bfe82f246308 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Tue, 23 Feb 1999 19:35:10 +0000 Subject: [PATCH] use AC_BROKEN_GLOB git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5416 ec53bebd-3082-4978-b11e-865c3cabbd6b --- configure.in | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index b4cefaeae..2f24695d0 100644 --- a/configure.in +++ b/configure.in @@ -269,7 +269,7 @@ AC_HEADER_STDC AC_CHECK_HEADERS(arpa/ftp.h arpa/inet.h arpa/nameser.h arpa/telnet.h ) AC_CHECK_HEADERS(bsdsetjmp.h crypt.h) AC_CHECK_HEADERS(curses.h db.h dbm.h dirent.h err.h errno.h) -AC_CHECK_HEADERS(fcntl.h fnmatch.h glob.h grp.h inttypes.h limits.h) +AC_CHECK_HEADERS(fcntl.h fnmatch.h grp.h inttypes.h limits.h) AC_CHECK_HEADERS(maillock.h ndbm.h) AC_CHECK_HEADERS(net/if.h netdb.h) AC_CHECK_HEADERS(netinet/in.h netinet/in6.h netinet/in6_var.h) @@ -292,12 +292,8 @@ if test "$ac_cv_header_err_h" = no; then AC_SUBST(EXTRA_HDRS) fi if test "$ac_cv_header_fnmatch_h" = no; then - EXTRA_HDRS="$EXTRA_HDRS fnmatch.h" - AC_SUBST(EXTRA_HDRS) -fi -if test "$ac_cv_header_glob_h" = no; then - EXTRA_HDRS="$EXTRA_HDRS glob.h" - AC_SUBST(EXTRA_HDRS) + NOINST_HDRS="$NOINST_HDRS fnmatch.h" + AC_SUBST(NOINST_HDRS) fi dnl Checks for libraries. @@ -353,6 +349,14 @@ dnl Checks for library functions. AC_BROKEN_SNPRINTF AC_BROKEN_VSNPRINTF +AC_BROKEN_GLOB + +if test "$ac_cv_func_glob_working" != yes; then + NOINST_HDRS="$NOINST_HDRS glob.h" + AC_SUBST(NOINST_HDRS) + LIBOBJS="$LIBOBJS glob.o" +fi + dnl these should happen after tests for *snprintf AC_FIND_FUNC_NO_LIBS(dbopen, $berkeley_db) @@ -422,7 +426,7 @@ fi AC_BROKEN(chown daemon err errx fchown flock fnmatch) AC_BROKEN(getcwd getdtablesize gethostname geteuid getgid getegid) -AC_BROKEN(getopt getusershell glob inet_aton initgroups iruserok lstat memmove) +AC_BROKEN(getopt getusershell inet_aton initgroups iruserok lstat memmove) AC_BROKEN(mkstemp putenv rcmd readv setegid setenv seteuid) AC_BROKEN(strcasecmp strncasecmp strdup strerror strftime strlwr strnlen) AC_BROKEN(strsep strtok_r strupr swab unsetenv verr verrx vsyslog)