X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/533bacb3b36e382d8e4c8cc1832ce9c37859eb3f..refs/heads/ip-billing-dev:/configure.in

diff --git a/configure.in b/configure.in
index 63c57460..b3b1384f 100755
--- a/configure.in
+++ b/configure.in
@@ -109,13 +109,15 @@ 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(krb4, krb_rd_req,
-	     [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto"],
+	     [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -l${crypto}"],
 	     [AC_CHECK_LIB(krb, krb_rd_req,
 			   [KRB4_LIBS="-lkrb -ldes"],
 			   [AC_MSG_ERROR(Kerberos 4 libraries not found)],
 			   $LIBPATH -ldes)],
-	     $LIBPATH -ldes425 -lkrb5 -lcrypto -lcom_err)
+	     $LIBPATH -ldes425 -lkrb5 -l${crypto} -lcom_err)
 
 AC_MSG_CHECKING(for Kerberos 5)
 AC_ARG_WITH(krb5,
@@ -128,7 +130,7 @@ if test "$krb5" != no; then
 	REG_SVR_INCLUDES=-I$krb5/include
 	REG_SVR_LIBS=-L$krb5/lib
     fi
-    REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -ldyn -lkrb4 -ldes425 -lkrb5 -lcrypto"
+    REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -ldyn -lkrb4 -ldes425 -lkrb5 -l${crypto}"
 else
     REG_SVR_DEFS=-DKRB4
     REG_SVR_LIBS=-lkadm
@@ -228,7 +230,7 @@ if test "$oracle" != no; then
 	    ;;
     esac
     SVRSUBDIRS='$(SVRDIRS)'
-    SERVER_OUTPUT_FILES="db/Makefile server/Makefile backup/Makefile dbck/Makefile dcm/Makefile gen/Makefile reg_svr/Makefile regtape/Makefile"
+    SERVER_OUTPUT_FILES="db/Makefile server/Makefile backup/Makefile dbck/Makefile dcm/Makefile gen/Makefile incremental/Makefile reg_svr/Makefile regtape/Makefile"
     PRO_C=$oracle/bin/proc
     PRO_C_OPTS=CODE=ANSI_C
     PRO_C_DEFS="DEFINE=_PROC_ $PRO_C_DEFS"
@@ -240,6 +242,31 @@ AC_SUBST(PRO_C_OPTS)
 AC_SUBST(SQL_LIBS)
 AC_SUBST(SVRSUBDIRS)
 
+# LDAP support
+AC_MSG_CHECKING(for LDAP)
+AC_ARG_WITH(ldap,
+    [  --with-ldap=PREFIX      Specify location of LDAP libs (for server)],
+    [ ldap="$withval"], 
+    [if test -n "$LDAP_HOME" -a -d "$LDAP_HOME"; then
+         ldap=$LDAP_HOME
+     else
+	 ldap=no
+     fi])
+AC_MSG_RESULT($ldap)
+if test "$ldap" != no -a "$oracle" != no; then
+    if test "$ldap" != yes; then
+        LDAP_CPPFLAGS="-I$ldap/include"
+	LDAP_LIBS="-L$ldap/lib"
+    fi
+    MR_DEFINE(HAVE_LDAP)
+
+    WINAD_SUBDIRS="winad"
+    WINAD_OUTPUT_FILES="incremental/winad/Makefile"
+fi
+AC_SUBST(LDAP_CPPFLAGS)
+AC_SUBST(LDAP_LIBS)
+AC_SUBST(WINAD_SUBDIRS)
+
 # AFS support
 AC_MSG_CHECKING(for AFS)
 AC_ARG_WITH(afs,
@@ -264,10 +291,10 @@ if test "$afs" != no -a "$oracle" != no; then
 		 $AFS_LIBS -lrx -llwp -lsys $AFS_EXTRA_LIBS)
     MR_DEFINE(HAVE_AFS)
 
-    AFS_SUBDIRS="incremental"
-    AFS_OUTPUT_FILES="incremental/Makefile"
+    AFS_SUBDIRS="afs"
+    AFS_OUTPUT_FILES="incremental/afs/Makefile"
     if test -d $srcdir/afssync; then
-	AFS_SUBDIRS="$AFS_SUBDIRS afssync"
+	AFS_SYNCDIR="afssync"
 	AFS_OUTPUT_FILES="$AFS_OUTPUT_FILES afssync/Makefile"
     fi
 fi
@@ -277,6 +304,7 @@ AC_SUBST(AFS_LIBS)
 AC_SUBST(AFS_EXTRA_LIBS)
 AC_SUBST(AFS_DIR)
 AC_SUBST(AFS_SUBDIRS)
+AC_SUBST(AFS_SYNCDIR)
 
 # GNU readline
 AC_CHECKING(for GNU readline...)
@@ -356,7 +384,7 @@ AC_CHECK_FUNCS(getusershell strlcpy strlcat uname)
 
 AC_CHECK_FUNC(sigaction, AC_DEFINE(HAVE_POSIX_SIGNALS))
 
-AC_CHECK_HEADERS(unistd.h getopt.h)
+AC_CHECK_HEADERS(unistd.h getopt.h netinet/in.h)
 
 MR_EXTEND(PRO_C_INCLUDES, INCLUDE='$(srcdir)')
 MR_INCLUDE('$(SRCTOP)/include')
@@ -374,9 +402,10 @@ AC_SUBST(MR_LIBDEP)
 
 AC_OUTPUT(Makefile lib/Makefile include/Makefile clients/Makefile \
 	  clients/lib/Makefile clients/addusr/Makefile \
-	  clients/blanche/Makefile clients/mailmaint/Makefile
-	  clients/moira/Makefile clients/mrcheck/Makefile
-	  clients/mrtest/Makefile clients/stella/Makefile \
-	  clients/passwd/Makefile update/Makefile man/Makefile \
-	  $SERVER_OUTPUT_FILES $AFS_OUTPUT_FILES \
+	  clients/blanche/Makefile clients/chfn/Makefile \
+	  clients/chpobox/Makefile clients/chsh/Makefile \
+	  clients/mailmaint/Makefile clients/moira/Makefile \
+	  clients/mrcheck/Makefile clients/mrtest/Makefile \
+	  clients/stella/Makefile update/Makefile man/Makefile \
+	  $SERVER_OUTPUT_FILES $WINAD_OUTPUT_FILES $AFS_OUTPUT_FILES \
 	  $RSAREF_OUTPUT_FILES)