AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_PROG_MAKE_SET
if test "$athena" = true; then
enable_athena=yes
prefix=/afs/.athena.mit.edu/system/moira
bindir=$prefix/arch/$ATHENA_SYS/bin
+ libdir=$prefix/arch/$ATHENA_SYS/lib
sbindir=$bindir
MR_INCLUDE(/usr/athena/include)
- MR_INCLUDE(/usr/athena/include/kerberosIV)
MR_LIBS(/usr/athena/lib)
fi
AC_SUBST(COM_ERR_SUBDIR)
AC_SUBST(COMPILE_ET)
-# Kerberos (Kerberos 4 required, Kerberos 5 optional for reg_svr)
+AC_CHECK_LIB(k5crypto, main, crypto="k5crypto",
+ [AC_CHECK_LIB(crypto, main, crypto="crypto")])
+
+# Kerberos (Kerberos 4 optional, Kerberos 5 required)
AC_MSG_CHECKING(for Kerberos 4)
AC_ARG_WITH(krb4,
[ --with-krb4=PREFIX Specify location of krb4],
[krb4="$withval"], [krb4=no])
AC_MSG_RESULT($krb4)
-if test $krb4 = "no"; then
- AC_MSG_ERROR(Kerberos is required for Moira)
-fi
-if test "$krb4" != yes; then
- MR_INCLUDE($krb4/include)
- if test -d "$krb4/include/kerberosIV"; then
- MR_INCLUDE($krb4/include/kerberosIV)
+if test "$krb4" != no; then
+ if test "$krb4" != yes; then
+ MR_INCLUDE($krb4/include)
+ if test -d "$krb4/include/kerberosIV"; then
+ MR_INCLUDE($krb4/include/kerberosIV)
+ fi
+ MR_LIBS($krb4/lib)
+ elif test -d /usr/include/kerberosIV; then
+ MR_INCLUDE(/usr/include/kerberosIV)
fi
- MR_LIBS($krb4/lib)
-elif test -d /usr/include/kerberosIV; then
- MR_INCLUDE(/usr/include/kerberosIV)
+ MR_DEFINE(HAVE_KRB4)
+ AC_CHECK_LIB(krb4, krb_rd_req,
+ [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -l${crypto} -lresolv"],
+ [AC_CHECK_LIB(krb, krb_rd_req,
+ [KRB4_LIBS="-lkrb -ldes"],
+ [AC_MSG_ERROR(Kerberos 4 libraries not found)],
+ $LIBPATH -ldes)],
+ $LIBPATH -ldes425 -lkrb5 -l${crypto} -lcom_err -lresolv)
fi
-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} -lresolv"],
- [AC_CHECK_LIB(krb, krb_rd_req,
- [KRB4_LIBS="-lkrb -ldes"],
- [AC_MSG_ERROR(Kerberos 4 libraries not found)],
- $LIBPATH -ldes)],
- $LIBPATH -ldes425 -lkrb5 -l${crypto} -lcom_err -lresolv)
AC_MSG_CHECKING(for Kerberos 5)
AC_ARG_WITH(krb5,
- [ --with-krb5=PREFIX Specify location of krb5 (for reg_svr)],
+ [ --with-krb5=PREFIX Specify location of krb5],
[krb5="$withval"], [krb5=no])
AC_MSG_RESULT($krb5)
if test "$krb5" != no; then
if test "$krb5" != yes; then
REG_SVR_INCLUDES=-I$krb5/include
REG_SVR_LIBS=-L$krb5/lib
+ MR_INCLUDE($krb5/include)
+ MR_LIBS($krb5/lib)
fi
- REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -lkrb4 -ldes425 -lkrb5 -l${crypto} -lresolv"
+ MR_DEFINE(HAVE_KRB5)
+ KRB5_LIBS="-lkrb5 -l${crypto} -lcom_err -lresolv"
+ REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -lkrb5 -l${crypto} -lresolv"
else
REG_SVR_DEFS=-DKRB4
REG_SVR_LIBS=-lkadm
fi
AC_CHECK_LIB(zephyr, ZInitialize, :,
[AC_MSG_ERROR(Zephyr library not found)],
- $LIBPATH $KRB4_LIBS -lcom_err)
+ $LIBPATH $KRB4_LIBS $KRB5_LIBS -lcom_err)
MR_DEFINE(HAVE_ZEPHYR)
fi
fi
MR_DEFINE(HAVE_LDAP)
- WINAD_SUBDIRS="winad"
- WINAD_OUTPUT_FILES="incremental/winad/Makefile"
+ WINAD_SUBDIRS="winad ldap"
+ WINAD_OUTPUT_FILES="incremental/winad/Makefile incremental/ldap/Makefile"
fi
AC_SUBST(LDAP_CPPFLAGS)
AC_SUBST(LDAP_LIBS)
MR_INCLUDE('$(BUILDTOP)/db')
MR_INCLUDE('$(srcdir)')
LDFLAGS="$LDFLAGS -L\$(BUILDTOP)/lib $LIBPATH"
-KLIBS="-lzephyr $KRB4_LIBS -lcom_err -lhesiod $LIBS"
+KLIBS="$KRB4_LIBS $KRB5_LIBS -lcom_err $LIBS"
+KLIBS="$LIBS"
+if test "$hesiod" != no; then
+ KLIBS="-lhesiod $KLIBS"
+fi
+KLIBS="$KRB4_LIBS $KRB5_LIBS -lcom_err $KLIBS"
+if test "$zephyr" != no; then
+ KLIBS="-lzephyr $KLIBS"
+fi
LIBS="-lmoira $KLIBS"
AC_SUBST(KLIBS)
-MR_LIBDEP='$(BUILDTOP)/lib/libmoira.a'
+MR_LIBDEP='$(BUILDTOP)/lib/libmoira.la'
AC_SUBST(MR_LIBDEP)
AC_OUTPUT(Makefile lib/Makefile include/Makefile clients/Makefile \