X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/106638417f787bf077db15294cf54e068113e5c8..99e5043db7ee6cf80f93708610a6e584a8068c6a:/configure.in

diff --git a/configure.in b/configure.in
index f029fd65..85e5181b 100644
--- a/configure.in
+++ b/configure.in
@@ -444,8 +444,8 @@ AC_HEADER_SYS_WAIT
 AC_HEADER_STAT
 AC_CHECK_HEADERS(string.h memory.h stdlib.h unistd.h errno.h fcntl.h \
                  limits.h crypt.h termcap.h termio.h termios.h locale.h \
-                 netdb.h sys/param.h sys/time.h sys/utsname.h arpa/inet.h \
-                 arpa/ftp.h)
+                 langinfo.h netdb.h sys/param.h sys/time.h sys/utsname.h \
+                 arpa/inet.h arpa/ftp.h)
 
 
 AC_CACHE_CHECK(POSIX termios, nmh_cv_sys_posix_termios,
@@ -499,7 +499,7 @@ AC_FUNC_VFORK
 AC_CHECK_LIB(mkstemp,mkstemp)
 AC_CHECK_FUNCS(waitpid wait3 sigaction sigprocmask sigblock sigsetmask \
                sighold sigrelse writev lstat uname tzset killpg mkstemp \
-               sethostent getutent)
+               sethostent getutent nl_langinfo)
 
 dnl solaris screws this up
 AC_CHECK_FUNC(gethostbyname, [AC_DEFINE(HAVE_GETHOSTBYNAME)],
@@ -555,13 +555,14 @@ AC_CHECK_FUNC(dbm_open, ,
   AC_CHECK_LIB(ndbm, dbm_open, ,
     AC_CHECK_LIB(dbm, dbm_open, ,
       AC_CHECK_LIB(db1, dbm_open, ,
-        AC_CHECK_LIB(gdbm, dbm_open)))))
+        AC_CHECK_LIB(gdbm, dbm_open, ,
+          AC_CHECK_LIB(db, __db_ndbm_open))))))
 
 dnl ----------------
 dnl CHECK FOR NDBM.H
 dnl ----------------
 
-AC_CHECK_HEADERS(db1/ndbm.h gdbm/ndbm.h, break, )
+AC_CHECK_HEADERS(db1/ndbm.h gdbm/ndbm.h db.h, break, )
 
 dnl ----------------
 dnl CHECK FOR HESIOD
@@ -638,8 +639,8 @@ if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
   fi
   save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $SASL_LIBS"
-  AC_CHECK_LIB(sasl, sasl_client_new,
-    [SASL_LIBS="$SASL_LIBS -lsasl"],
+  AC_CHECK_LIB(sasl2, sasl_client_new,
+    [SASL_LIBS="$SASL_LIBS -lsasl2"],
     [AC_MSG_ERROR(Cyrus SASL library not found)])
   LDFLAGS="$save_LDFLAGS"
 fi