From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 17 Jan 2002 21:04:43 +0000 (+0000)
Subject: Added check for fnmatch.h.
X-Git-Tag: hans.van.dalen~10
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=55003dbfec0492fabba2dcfaffc7a4c698742f98;p=yaz-moved-to-github.git

Added check for fnmatch.h.
---

diff --git a/client/admin.c b/client/admin.c
index e20825c..b2579a1 100644
--- a/client/admin.c
+++ b/client/admin.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2001, Index Data
  * See the file LICENSE for details.
  *
- * $Id: admin.c,v 1.11 2001-11-13 23:00:42 adam Exp $
+ * $Id: admin.c,v 1.12 2002-01-17 21:04:43 adam Exp $
  */
 
 #include <stdio.h>
@@ -10,9 +10,7 @@
 #include <time.h>
 #include <assert.h>
 
-#ifdef WIN32
-
-#else
+#if HAVE_FNMATCH_H
 #include <dirent.h>
 #include <fnmatch.h>
 #include <sys/stat.h>
@@ -177,15 +175,7 @@ int cmd_adm_drop(char* arg)
    N.B. That in this case, the import may contain instructions to delete records as well as new or updates
    to existing records */
 
-#ifdef WIN32
-int cmd_adm_import(char *arg)
-{
-    printf ("not available on WIN32\n");
-    return 0;
-}
-
-#else
-
+#if HAVE_FNMATCH_H
 int cmd_adm_import(char *arg)
 {
     char type_str[20], dir_str[1024], pattern_str[1024];
@@ -267,6 +257,12 @@ int cmd_adm_import(char *arg)
     closedir(dir);
     return 2;
 }
+#else
+int cmd_adm_import(char *arg)
+{
+    printf ("not available on WIN32\n");
+    return 0;
+}
 #endif
 
 int cmd_adm_import2(char* arg)
diff --git a/configure.in b/configure.in
index fe6f8cc..524ee20 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.58 2002-01-11 20:26:11 adam Exp $
+dnl $Id: configure.in,v 1.59 2002-01-17 21:04:43 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.8.5)
 dnl
@@ -111,6 +111,7 @@ if test "$enable_tcpd" != ""; then
 fi
 dnl
 dnl ------ Headers
+AC_CHECK_HEADERS(fnmatch.h)
 AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = "no"; then
 	AC_MSG_WARN(Your system doesn't seem to support ANSI C)