Revert "Increment VERSION on the head to 1.7+dev."

[nmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index b26abb9492cf92b6dbd6e952532e5269e6e4b506..daf96ee3389ba80993e6b621ad3aec68e3ae4f04 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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))))))))))
-
+                      NMH_CHECK_NDBM(ndbm.h,gdbm_compat -lgdbm
+                        NMH_CHECK_NDBM(gdbm-ndbm.h,gdbm_compat)))))))))))
+    dnl Please don't remove gdbm-ndbm.h,gdbm_compat.  (On Linux,
+    dnl libgdbm_compat.so loads libgdbm.so as well, so it doesn't
+    dnl need to be explicit.).
   fi
 else
   dnl We don't really need to check that the user-specified values work,
@@ -490,11 +493,11 @@ dnl Use LFLAGS make variable setting to work around bugs in flex
 dnl 2.5.36 that cause signed/unsigned mismatch,
 dnl http://sourceforge.net/p/flex/bugs/140/
 AS_IF([test "$LEX" = flex],
-      [$LEX -V; AS_CASE([`$LEX -V`],
+      [AS_CASE([`$LEX -V`],
                [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 ----------------