Rob Shearman : Add configure check for dirent.h and readdir.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 87175c61f5ccd5119a68d1eaedfc0321e61c9543
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=87175c61f5ccd5119a68d1eaed...

Author: Rob Shearman 
Date:   Fri Oct  3 12:55:21 2008 +0100

Add configure check for dirent.h and readdir.

---

configure                |    4 ++++
 configure.ac             |    2 ++
 dlls/crypt32/rootstore.c |    7 +++++++
 include/config.h.in      |    6 ++++++
 4 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 2875786..c9c04e3 100755
--- a/configure
+++ b/configure
@@ -7217,6 +7217,7 @@ done

+
 for ac_header in \
    AudioUnit/AudioUnit.h \
    Carbon/Carbon.h \
@@ -7231,6 +7232,7 @@ for ac_header in \
    capi20.h \
    curses.h \
    direct.h \
+	dirent.h \
    dlfcn.h \
    elf.h \
    float.h \
@@ -17206,6 +17208,7 @@ esac

+
 for ac_func in \
    _pclose \
    _popen \
@@ -17249,6 +17252,7 @@ for ac_func in \
    prctl \
    pread \
    pwrite \
+	readdir \
    readlink \
    rfork \
    sched_yield \
diff --git a/configure.ac b/configure.ac
index 52f5752..a7783f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,6 +237,7 @@ AC_CHECK_HEADERS(\
    capi20.h \
    curses.h \
    direct.h \
+	dirent.h \
    dlfcn.h \
    elf.h \
    float.h \
@@ -1401,6 +1402,7 @@ AC_CHECK_FUNCS(\
    prctl \
    pread \
    pwrite \
+	readdir \
    readlink \
    rfork \
    sched_yield \
diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c
index b1bbe9f..22bfd19 100644
--- a/dlls/crypt32/rootstore.c
+++ b/dlls/crypt32/rootstore.c
@@ -22,7 +22,9 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
+#ifdef HAVE_DIRENT_H
 #include <dirent.h>
+#endif
 #include <fcntl.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -313,6 +315,7 @@ static BOOL import_certs_from_path(LPCSTR path, HCERTSTORE store,
  */
 static BOOL import_certs_from_dir(LPCSTR path, HCERTSTORE store)
 {
+#ifdef HAVE_READDIR
     BOOL ret = FALSE;
     DIR *dir;

@@ -341,6 +344,10 @@ static BOOL import_certs_from_dir(LPCSTR path, HCERTSTORE store)
         }
     }
     return ret;
+#else
+    FIXME("not implemented without readdir available\n");
+    return FALSE;
+#endif
 }

/* Opens path, which may be a file or a directory, and imports any certificates
diff --git a/include/config.h.in b/include/config.h.in
index 49ed198..3566a94 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -65,6 +65,9 @@
 /* Define to 1 if you have the <direct.h> header file. */
 #undef HAVE_DIRECT_H

+/* Define to 1 if you have the <dirent.h> header file. */
+#undef HAVE_DIRENT_H
+
 /* Define to 1 if you have the <DiskArbitration/DiskArbitration.h> header
    file. */
 #undef HAVE_DISKARBITRATION_DISKARBITRATION_H
@@ -570,6 +573,9 @@
 /* Define to 1 if you have the `pwrite' function. */
 #undef HAVE_PWRITE

+/* Define to 1 if you have the `readdir' function. */
+#undef HAVE_READDIR
+
 /* Define to 1 if you have the `readlink' function. */
 #undef HAVE_READLINK