From 932be9aa52cc56ab429f203718e847a040a3b6d8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 9 Sep 1998 06:31:13 +0000 Subject: [PATCH] handle sstem (sco 3) with glob but not glob.h --- configure.in | 1 + rsync.h | 2 +- util.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 3afb857c..82f164e0 100644 --- a/configure.in +++ b/configure.in @@ -16,6 +16,7 @@ AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h unistd.h utime.h grp.h) AC_CHECK_HEADERS(compat.h sys/param.h ctype.h sys/wait.h sys/ioctl.h) AC_CHECK_HEADERS(sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h) +AC_CHECK_HEADERS(glob.h) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) diff --git a/rsync.h b/rsync.h index b2945133..ef7ea888 100644 --- a/rsync.h +++ b/rsync.h @@ -169,7 +169,7 @@ #include "lib/fnmatch.h" #endif -#ifdef HAVE_GLOB +#ifdef HAVE_GLOB_H #include #endif diff --git a/util.c b/util.c index 8b36474e..6e0fbaba 100644 --- a/util.c +++ b/util.c @@ -427,7 +427,7 @@ int lock_range(int fd, int offset, int len) static void glob_expand_one(char *s, char **argv, int *argc, int maxargs) { -#ifndef HAVE_GLOB +#if !(defined(HAVE_GLOB) && defined(HAVE_GLOB_H)) if (!*s) s = "."; argv[*argc] = strdup(s); (*argc)++; -- 2.34.1