Check for libk5crypto before libcrypto, so openssl's libcrypto doesn't

[moira.git] / configure.in

diff --git a/configure.in b/configure.in
index 8dfb1fed35f61ece4974c7c7cd965ad5bbcb918e..e52675d0b889b2f65b714fc6cb4665d8daa03f9d 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -11,17 +11,23 @@ AC_DEFUN(MR_EXTEND, [
 ])
 
 AC_CANONICAL_HOST
+# SO_LDFLAGS setting below is a great big ick.
+# But it beats sucking in libtool for one small part of the source tree.
 case $host_os in
 solaris*)
        short_os=solaris
+       SO_LDFLAGS="-G"
        ;;
 irix*)
        short_os=irix
+       SO_LDFLAGS="-shared"
        ;;
 linux*)
        short_os=linux
+       SO_LDFLAGS="-shared"
        ;;
 esac
+AC_SUBST(SO_LDFLAGS)
 
 dnl Define for both C and Pro*C
 AC_DEFUN(MR_DEFINE, [
@@ -122,8 +128,8 @@ if test "$krb4" != yes; then
 elif test -d /usr/include/kerberosIV; then
     MR_INCLUDE(/usr/include/kerberosIV)
 fi
-AC_CHECK_LIB(crypto, main, crypto="crypto",
-             [AC_CHECK_LIB(k5crypto, main, crypto="k5crypto")])
+AC_CHECK_LIB(k5crypto, main, crypto="k5crypto",
+             [AC_CHECK_LIB(crypto, main, crypto="crypto")])
 AC_CHECK_LIB(krb4, krb_rd_req,
             [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -l${crypto}"],
             [AC_CHECK_LIB(krb, krb_rd_req,
@@ -276,6 +282,7 @@ if test "$java" != no; then
     WEBMOIRA_OUTPUT_FILES="webmoira/Makefile"
 fi
 AC_SUBST(JAVA_CPPFLAGS)
+AC_SUBST(WEBMOIRA_SUBDIRS)
 
 # LDAP support
 AC_MSG_CHECKING(for LDAP)
@@ -415,7 +422,7 @@ AC_SUBST(CURSES_LIBS)
 AC_SUBST(CURSES_SUBDIRS)
 
 
-AC_CHECK_FUNCS(getusershell strlcpy strlcat uname)
+AC_CHECK_FUNCS(getusershell strlcpy strlcat uname strvis)
 
 AC_CHECK_FUNC(sigaction, AC_DEFINE(HAVE_POSIX_SIGNALS))