X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/64e8827c5d5def0325ab7181fe939623c77e807c..51919715ad7a57f2c74854a6d3d6374578f46985:/configure.ac

diff --git a/configure.ac b/configure.ac
index 35118f34..a4caa82f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -341,7 +341,7 @@ AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM,1,
 dnl ---------------
 dnl CHECK FUNCTIONS
 dnl ---------------
-AC_CHECK_FUNCS([wcwidth mbtowc getutxent arc4random])
+AC_CHECK_FUNCS([wcwidth mbtowc getutxent arc4random mkstemps])
 
 dnl Check for multibyte character set support
 AS_IF([test "x$ac_cv_header_wchar_h" = "xyes" -a \
@@ -404,7 +404,7 @@ if test "$nmh_ndbm" = "autodetect"; then
     dnl first so we don't accidentally link in a pointless but harmless
     dnl library in one of the later ndbm.h+libfoo tests:
     NMH_CHECK_NDBM(ndbm.h,,,
-    dnl Berkeley DBv2 emulating ndbm: header in db.h:
+    dnl Berkeley DBv2 emulating ndbm: header in db.h, e.g., 32-bit Cygwin:
       NMH_CHECK_NDBM(db.h,db,,
     dnl Berkeley DBv1 emulating ndbm:
         NMH_CHECK_NDBM(ndbm.h,db,,
@@ -418,8 +418,11 @@ if test "$nmh_ndbm" = "autodetect"; then
                 NMH_CHECK_NDBM(gdbm/ndbm.h,gdbm,,
                   NMH_CHECK_NDBM(gdbm/ndbm.h,gdbm_compat -lgdbm,,
                     NMH_CHECK_NDBM(ndbm.h,gdbm,,
-                      NMH_CHECK_NDBM(ndbm.h,gdbm_compat -lgdbm))))))))))
-
+    dnl 64-bit Cygwin:
+                      NMH_CHECK_NDBM(ndbm.h,gdbm_compat -lgdbm,,
+    dnl On Linux, libgdbm_compat.so loads libgdbm.so as well, so it doesn't
+    dnl need to be explicit:
+                        NMH_CHECK_NDBM(gdbm-ndbm.h,gdbm_compat)))))))))))
   fi
 else
   dnl We don't really need to check that the user-specified values work,
@@ -494,7 +497,7 @@ AS_IF([test "$LEX" = flex],
                [flex\ 2.5.35], [LFLAGS=\
 '; sed -e "s/	int n;/	size_t n;/" $@ >$@.tmp && mv -f $@.tmp $@; true'],
                [flex\ 2.5.36], [LFLAGS=\
-'; sed -s "s/\(	\)int i;/\1yy_size_t i;/" $@ >$.tmp && mv -f $@.tmp $@; true'])
+'; sed -s "s/\(	\)int i;/\1yy_size_t i;/" $@ >$@.tmp && mv -f $@.tmp $@; true'])
        AC_SUBST([LFLAGS])])
 
 dnl ----------------