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

diff --git a/configure.in b/configure.in
index 44fc44ea..48e90c7b 100755
--- a/configure.in
+++ b/configure.in
@@ -10,6 +10,25 @@ AC_DEFUN(MR_EXTEND, [
     esac
 ])
 
+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, [
     AC_DEFINE($1)
@@ -109,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,
@@ -225,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"
@@ -242,6 +264,29 @@ AC_SUBST(PRO_C_OPTS)
 AC_SUBST(SQL_LIBS)
 AC_SUBST(SVRSUBDIRS)
 
+# Java support, for webmoira
+AC_MSG_CHECKING(for Java)
+AC_ARG_WITH(java,
+    [ --with-java=PREFIX       Specify location of Java libs and headers],
+    [ java="$withval"],
+    [if test -n "$JAVA_HOME" -a -d "$JAVA_HOME"; then
+	java=$JAVA_HOME
+     else
+	java=no
+     fi])
+AC_MSG_RESULT($java)
+if test "$java" != no; then
+    if test "$java" != yes; then
+	JAVA_CPPFLAGS="-I$java/include -I$java/include/$short_os"
+    fi
+    MR_DEFINE(HAVE_JAVA)
+
+    WEBMOIRA_SUBDIRS="webmoira"
+    WEBMOIRA_OUTPUT_FILES="webmoira/Makefile"
+fi
+AC_SUBST(JAVA_CPPFLAGS)
+AC_SUBST(WEBMOIRA_SUBDIRS)
+
 # LDAP support
 AC_MSG_CHECKING(for LDAP)
 AC_ARG_WITH(ldap,
@@ -380,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))
 
@@ -419,7 +464,7 @@ AC_OUTPUT(Makefile lib/Makefile include/Makefile clients/Makefile \
 	  clients/chpobox/Makefile clients/chsh/Makefile \
 	  clients/mailmaint/Makefile clients/moira/Makefile \
 	  clients/mrcheck/Makefile clients/mrtest/Makefile \
-	  clients/stanley/Makefile clients/stella/Makefile\
-	   update/Makefile man/Makefile \
+	  clients/stanley/Makefile clients/stella/Makefile \
+	   update/Makefile man/Makefile $WEBMOIRA_OUTPUT_FILES \
 	  $SERVER_OUTPUT_FILES $WINAD_OUTPUT_FILES $AFS_OUTPUT_FILES \
 	  $RSAREF_OUTPUT_FILES)