X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/3595c6c03ad1557dbcd67cecb3e3f9ad5999e517..refs/heads/moira-krb5:/configure.in

diff --git a/configure.in b/configure.in
index 8dfb1fed..48e90c7b 100755
--- 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,
@@ -238,9 +244,12 @@ if test "$oracle" != no; then
 	2.0.6.0.0)
 	    SQL_LIBS="-L$oracle/lib -lsql $oracle/lib/osntab.o -lsqlnet -lora -lsqlnet -lnlsrtl -lcv6 -lcore -lnlsrtl -lcore -lm"
 	    ;;
-	*)
+	2.2.4.0.0)
 	    SQL_LIBS="-L$oracle/lib -lclntsh -lxa -lsql -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric   -lepc -lnlsrtl3 -lc3v6 -lcore3 -lnlsrtl3 -lcore3 -lnlsrtl3 `cat $oracle/rdbms/lib/sysliblist` -lm -lthread"
 	    ;;
+	*)
+	    SQL_LIBS="-L$oracle/lib -lclntsh `cat $oracle/lib/sysliblist` -R$oracle/lib -laio -lm -lthread"
+	    ;;
     esac
     SVRSUBDIRS='$(SVRDIRS)'
     SERVER_OUTPUT_FILES="db/Makefile server/Makefile backup/Makefile dbck/Makefile dcm/Makefile gen/Makefile incremental/Makefile reg_svr/Makefile regtape/Makefile"
@@ -276,6 +285,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 +425,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))