Needed to comment out the inclusion of headers in fnmatch.c because it

couldn't find some of them (especially <fnmatch.h>, because it wasn't
looking in the current directory).  The header files are included better
from ../rsync.h.

diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index 81e0680..dd6297c 100644 (file)
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -2,7 +2,7 @@
 #ifndef HAVE_FNMATCH
 
 /* ----- THE FOLLOWING UP TO 'END' is glibc-2.1.2 posix/fnmatch.c
-     except for the part with the '#if 0' */
+     except for the parts with '#if 0' */
 
 /* Copyright (C) 1991, 92, 93, 96, 97, 98, 99 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
@@ -22,6 +22,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#if 0  /* header files included better by ../rsync.h */
+
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -45,6 +47,8 @@
 # include <stdlib.h>
 #endif
 
+#endif /* 0 */
+
 /* For platform which support the ISO C amendement 1 functionality we
    support user defined character classes.  */
 #if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)