Remove FNMATCH test in configure.in and always use

  the one in our library to get the FN_CASEFOLD GNU
  extensions on all platforms.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1764 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in
index c34113a08fcdafbaedfc902a312393543c6fa3b0..adac090114858ad76c045061c686d40ba76cfbdc 100644 (file)
--- a/bacula/autoconf/config.h.in
+++ b/bacula/autoconf/config.h.in
@@ -264,9 +264,6 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Define to 1 if your system has a working POSIX `fnmatch' function. */
-#undef HAVE_FNMATCH
-
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index a087caa07b00957530755dd50661458523d7069d..2f9b54961dcf02c28d064da4c1133b79131cbc02 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -1594,7 +1594,7 @@ AC_FUNC_ALLOCA
 AC_FUNC_GETMNTENT
 AC_FUNC_CLOSEDIR_VOID
 AC_FUNC_SETPGRP                      dnl check for BSD setpgrp.
-AC_FUNC_FNMATCH
+# AC_FUNC_FNMATCH    dnl use local version
 
 
 dnl# FreeBSD needs to link libxpg4

diff --git a/bacula/configure b/bacula/configure
index 302f99c5fd1a64e9ab80ef57e64cf5503fb86407..6ff43c68bff214b7a1a15f689ba2d6b74db0aaef 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -18240,79 +18240,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
-                     echo "$as_me:$LINENO: checking for working POSIX fnmatch" >&5
-echo $ECHO_N "checking for working POSIX fnmatch... $ECHO_C" >&6
-if test "${ac_cv_func_fnmatch_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Some versions of Solaris, SCO, and the GNU C Library
-   # have a broken or incompatible fnmatch.
-   # So we run a test program.  If we are cross-compiling, take no chance.
-   # Thanks to John Oleynick, Franc,ois Pinard, and Paul Eggert for this test.
-   if test "$cross_compiling" = yes; then
-  ac_cv_func_fnmatch_works=cross
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <fnmatch.h>
-#         define y(a, b, c) (fnmatch (a, b, c) == 0)
-#         define n(a, b, c) (fnmatch (a, b, c) == FNM_NOMATCH)
-
-int
-main ()
-{
-exit
-          (!(y ("a*", "abc", 0)
-             && n ("d*/*1", "d/s/1", FNM_PATHNAME)
-             && y ("a\\\\bc", "abc", 0)
-             && n ("a\\\\bc", "abc", FNM_NOESCAPE)
-             && y ("*x", ".x", 0)
-             && n ("*x", ".x", FNM_PERIOD)
-             && 1));
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_fnmatch_works=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_fnmatch_works=no
-fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_fnmatch_works" >&5
-echo "${ECHO_T}$ac_cv_func_fnmatch_works" >&6
-if test $ac_cv_func_fnmatch_works = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FNMATCH 1
-_ACEOF
-
-fi
-
-
-
+                     # AC_FUNC_FNMATCH    dnl use local version
 
 
 echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index a29c9238078b03d0244c5c453b956405144bc10e..a5fc2a1333e5c39c993b8e5374c3bae6c923c7ca 100644 (file)
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -172,7 +172,7 @@
  * that it can filter packets, but otherwise, it is not used
  * or saved */
 #define FT_DIRBEGIN  18               /* Directory at beginning (not saved) */
-#define FT_INVALIDFS 19                      /* File system not allowed for */
+#define FT_INVALIDFS 19               /* File system not allowed for */
 
 /* Definitions for upper part of type word (see above). */
 #define AR_DATA_STREAM (1<<16)        /* Data stream id present */
@@ -483,9 +483,6 @@ extern int thr_setconcurrency(int);
 #ifdef HAVE_DARWIN_OS
 /* Apparently someone forgot to wrap getdomainname as a C function */
 extern "C" int getdomainname(char *name, int len);
-
-/* Darwin lib fnmatch() doesn't work, so use our own */
-#undef HAVE_FNMATCH
 #endif
 
 #ifdef HAVE_CYGWIN

diff --git a/bacula/src/findlib/find.h b/bacula/src/findlib/find.h
index 0b62f0da37bf5c1bddc0d595ffacd8f5ed16481a..11038e5df0afe9b77b5436399f825d692b83ff2e 100755 (executable)
--- a/bacula/src/findlib/find.h
+++ b/bacula/src/findlib/find.h
@@ -46,11 +46,7 @@ struct utimbuf {
 
 #define MODE_RALL (S_IRUSR|S_IRGRP|S_IROTH)
 
-#ifdef HAVE_FNMATCH
-#include <fnmatch.h>
-#else
 #include "lib/fnmatch.h"
-#endif
 
 #ifdef HAVE_REGEX_H
 #include <regex.h>

diff --git a/bacula/src/lib/fnmatch.c b/bacula/src/lib/fnmatch.c
index 71dd0e1dd52ecedc254143722cf6e11636845c22..6b0ceb6b992f1657fc202c1ad7bf8fd1323a816a 100644 (file)
--- a/bacula/src/lib/fnmatch.c
+++ b/bacula/src/lib/fnmatch.c
@@ -16,7 +16,6 @@
 
 #include "bacula.h"
  
-#ifndef HAVE_FNMATCH
 
 /* Enable GNU extensions in fnmatch.h. */
 #ifndef _GNU_SOURCE
@@ -235,5 +234,3 @@ fnmatch (const char *pattern, const char *string, int flags)
 }
 
 #endif /* _LIBC or not __GNU_LIBRARY__.  */
-
-#endif /* !HAVE_FNMATCH */