* configure.in: properly test for either <gdbm/ndbm.h> or

<gdbm-ndbm.h> (unfortunately, Autoconf will map both names to the
same $ac_cv_* variable name).  Some systems support one header or
another.  Patch inspired by work Debian did.

diff --git a/ChangeLog b/ChangeLog
index b6d01eb4c1510c0e5eea09d33a1403c6ae390ee9..a41f6b1b85828b78fe0dda371fdf18c6a0df16ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-08  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * configure.in: properly test for either <gdbm/ndbm.h> or
+       <gdbm-ndbm.h> (unfortunately, Autoconf will map both names to the
+       same $ac_cv_* variable name).  Some systems support one header or
+       another.  Patch inspired by work Debian did.
+
 2006-02-16  Daniel P. Ottavio  <ottavio@vm.fsl.cs.sunysb.edu>
 
        * amd/sum_map_tok.l: Fixed a bug in a regular expression that

diff --git a/configure.in b/configure.in
index 1fead36fdf544051b7d72009cd0a6773047b583b..a4482ce9cb162af8f7cfe4fabc2ee6a02df583bf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,7 @@ AH_BOTTOM([
 dnl
 dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.123 $)
+AC_REVISION($Revision: 1.124 $)
 AC_COPYRIGHT([Copyright (c) 1997-2006 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)
@@ -662,8 +662,16 @@ fi
 if test "$ac_cv_lib_new_dbm" = "" -a "$ac_cv_header_db1_ndbm_h" = "yes"; then
   AC_CHECK_LIB(db1, dbm_open, ac_cv_header_new_dbm="db1/ndbm.h"; ac_cv_lib_new_dbm="db1")
 fi
+dnl nasty workaround:  <gdbm/ndbm.h> and <gdbm-ndbm.h> map to the same ac_cv_ variable name
 if test "$ac_cv_lib_new_dbm" = "" -a "$ac_cv_header_gdbm_ndbm_h" = "yes"; then
   AC_CHECK_LIB(gdbm, dbm_open, ac_cv_header_new_dbm="gdbm/ndbm.h"; ac_cv_lib_new_dbm="gdbm")
+else
+  # reset any previous knowledge and retest for different header name
+  unset ac_cv_header_gdbm_ndbm_h
+  AC_CHECK_HEADERS(gdbm-ndbm.h)
+  if test "$ac_cv_lib_new_dbm" = "" -a "$ac_cv_header_gdbm_ndbm_h" = "yes"; then
+    AC_CHECK_LIB(gdbm, dbm_open, ac_cv_header_new_dbm="gdbm-ndbm.h"; ac_cv_lib_new_dbm="gdbm")
+  fi
 fi
 if test "$ac_cv_header_new_dbm" != "" -a "$ac_cv_lib_new_dbm" != ""; then
   AC_DEFINE_UNQUOTED(NEW_DBM_H, "$ac_cv_header_new_dbm")