Updates to handle glob.h - was causing problems on SCO 5.0.4

diff --git a/source/configure b/source/configure
index 1978a1ddb55e14b6e5a29afd49669e6b9c28a412..0cd5e39d74ec4801a5f2ade8dc360dd355520cfc 100755 (executable)
--- a/source/configure
+++ b/source/configure
@@ -1892,7 +1892,7 @@ else
 fi
 done
 
-for ac_hdr in sys/acl.h sys/cdefs.h
+for ac_hdr in sys/acl.h sys/cdefs.h glob.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

diff --git a/source/configure.in b/source/configure.in
index 178d566c8056a66ce73072b2200391ca97160a2d..5030c7ffe946103bb72f1a153601a91b01e78701 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -39,7 +39,7 @@ AC_CHECK_HEADERS(sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)
 AC_CHECK_HEADERS(shadow.h netinet/tcp.h sys/security.h security/pam_appl.h)
 AC_CHECK_HEADERS(stropts.h poll.h readline.h history.h readline/readline.h)
 AC_CHECK_HEADERS(readline/history.h sys/capability.h syscall.h sys/syscall.h)
-AC_CHECK_HEADERS(sys/acl.h sys/cdefs.h)
+AC_CHECK_HEADERS(sys/acl.h sys/cdefs.h glob.h)
 
 AC_CHECK_SIZEOF(int,cross)
 AC_CHECK_SIZEOF(long,cross)

diff --git a/source/include/config.h.in b/source/include/config.h.in
index 3f1df1f33b4aaaf075f95337382c74ba9c45291b..01bc2ee0d8d0bf2f567c56cdf036d80b325020de 100644 (file)
--- a/source/include/config.h.in
+++ b/source/include/config.h.in
@@ -594,6 +594,9 @@
 /* Define if you have the <fcntl.h> header file.  */
 #undef HAVE_FCNTL_H
 
+/* Define if you have the <glob.h> header file.  */
+#undef HAVE_GLOB_H
+
 /* Define if you have the <grp.h> header file.  */
 #undef HAVE_GRP_H
 

diff --git a/source/include/includes.h b/source/include/includes.h
index 274d3ccf249938171ed76d568b91d948bc4b6b83..fc718961a954c9f595d9334b658d04694538c2dc 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -161,7 +161,7 @@
 #endif
 #endif
 
-#ifdef HAVE_GLOB
+#ifdef HAVE_GLOB_H
 #include <glob.h>
 #endif