Update for the brave new world

[mmh] / configure.in

diff --git a/configure.in b/configure.in
index f544ac6..fec2eab 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -270,14 +270,21 @@ dnl CHECK FUNCTIONS
 dnl ---------------
 AC_FUNC_VFORK
 AC_CHECK_FUNCS(waitpid wait3 sigaction sigprocmask sigblock sigsetmask \
-               sighold sigrelse writev lstat uname tzset killpg \
-               sigsetjmp)
+               sighold sigrelse writev lstat uname tzset killpg)
+
+dnl sigsetjmp may be a macro
+AC_MSG_CHECKING(for sigsetjmp)
+AC_TRY_LINK([#include <setjmp.h>], [sigsetjmp((void *)0, 0);],
+        [AC_DEFINE(HAVE_SIGSETJMP) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))
 
 AC_REPLACE_FUNCS(snprintf strerror strdup)
 
 dnl -------------------
 dnl CHECK FOR LIBRARIES
 dnl -------------------
+dnl Check location of modf
+AC_CHECK_FUNC(modf, , AC_CHECK_LIB(m, modf))
+
 dnl Checks for network libraries (nsl, socket)
 AC_CHECK_NETLIBS
 
@@ -331,7 +338,7 @@ if test x$with_krb4 != x -a x$with_krb4 != xno; then
   AC_CHECK_LIB(krb4, krb_rd_req,
     [KRB4_LIBS="$KRB4_LIBS -lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err"],
     [AC_CHECK_LIB(krb, krb_rd_req,
-      [KRB4_LIBS="-lkrb -ldes"],
+      [KRB4_LIBS="$KRB4_LIBS -lkrb -ldes"],
       [AC_MSG_ERROR(Kerberos 4 libraries not found)],
       $KRB4_LIBS -ldes)],
     $KRB4_LIBS -ldes425 -lkrb5 -lcrypto -lcom_err)