[1593] in Moira
configure.in changes
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Wed Jun 28 21:28:27 2000
Message-Id: <200006290128.VAA05177@ops-3.mit.edu>
To: moiradev@MIT.EDU
Date: Wed, 28 Jun 2000 21:28:23 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
to build regardless of whether we have libcrypto or
libk5crypto. Not shown is the regeneration of configure.
Garry
Index: configure.in
===================================================================
RCS file: /afs/athena.mit.edu/astaff/project/moiradev/repository/moira/configure.in,v
retrieving revision 1.26
diff -c -r1.26 configure.in
*** configure.in 2000/06/06 04:41:14 1.26
--- configure.in 2000/06/29 01:17:45
***************
*** 109,121 ****
elif test -d /usr/include/kerberosIV; then
MR_INCLUDE(/usr/include/kerberosIV)
fi
AC_CHECK_LIB(krb4, krb_rd_req,
! [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto"],
[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)
AC_MSG_CHECKING(for Kerberos 5)
AC_ARG_WITH(krb5,
--- 109,123 ----
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 -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 -l${crypto} -lcom_err)
AC_MSG_CHECKING(for Kerberos 5)
AC_ARG_WITH(krb5,
***************
*** 128,134 ****
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"
else
REG_SVR_DEFS=-DKRB4
REG_SVR_LIBS=-lkadm
--- 130,136 ----
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 -l${crypto}"
else
REG_SVR_DEFS=-DKRB4
REG_SVR_LIBS=-lkadm
