summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>1998-11-16 01:12:36 +0000
committerJohn Terpstra <jht@samba.org>1998-11-16 01:12:36 +0000
commit29cc8b8cd7326f0e83368f16d6666db3a674ae23 (patch)
tree293a7b7dbd492dfe80b843e10d0cd26216e61a27 /source3
parent00ae36ffd8079dc830fb4c7016a1f6ddd96d9b5c (diff)
downloadsamba-29cc8b8cd7326f0e83368f16d6666db3a674ae23.tar.gz
samba-29cc8b8cd7326f0e83368f16d6666db3a674ae23.tar.bz2
samba-29cc8b8cd7326f0e83368f16d6666db3a674ae23.zip
Updates to handle glob.h - was causing problems on SCO 5.0.4
(This used to be commit 5f7d9d4656eb501e14b98f4ae1990a791c7901e3)
Diffstat (limited to 'source3')
-rwxr-xr-xsource3/configure2
-rw-r--r--source3/configure.in2
-rw-r--r--source3/include/config.h.in3
-rw-r--r--source3/include/includes.h2
4 files changed, 6 insertions, 3 deletions
diff --git a/source3/configure b/source3/configure
index 1978a1ddb5..0cd5e39d74 100755
--- a/source3/configure
+++ b/source3/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/source3/configure.in b/source3/configure.in
index 178d566c80..5030c7ffe9 100644
--- a/source3/configure.in
+++ b/source3/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/source3/include/config.h.in b/source3/include/config.h.in
index 3f1df1f33b..01bc2ee0d8 100644
--- a/source3/include/config.h.in
+++ b/source3/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/source3/include/includes.h b/source3/include/includes.h
index 274d3ccf24..fc718961a9 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -161,7 +161,7 @@
#endif
#endif
-#ifdef HAVE_GLOB
+#ifdef HAVE_GLOB_H
#include <glob.h>
#endif