From ff5833da6d14532e223abe8423770a6fb04c5562 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Mon, 14 Oct 1996 11:00:02 +0000 Subject: [PATCH] * configure.in: Add AC_KRB5_TCL so configure --help is useful * aclocal.m4 (AC_KRB5_TCL): Added tests for --with-tcl. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9165 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ChangeLog | 6 +++++ src/aclocal.m4 | 58 ++++++++++++++++++++++++++++++++++++++---------- src/configure.in | 1 + 3 files changed, 53 insertions(+), 12 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 57d308de0..0fec6f560 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +Mon Oct 7 15:07:38 1996 Ezra Peisach + + * configure.in: Add AC_KRB5_TCL so configure --help is useful. + + * aclocal.m4 (AC_KRB5_TCL): Added tests for --with-tcl. + Fri Sep 6 20:23:13 1996 Theodore Y. Ts'o * patchlevel.h (KRB5_MAJOR_RELEASE): Update patch level file for diff --git a/src/aclocal.m4 b/src/aclocal.m4 index e12866087..261b0aeb2 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -228,8 +228,6 @@ if test $withval = no; then DEPKRB4_LIB= KRB4_CRYPTO_LIB= DEPKRB4_CRYPTO_LIB= - KDB4_LIB= - DEPKDB4_LIB= KRB4_INCLUDES= LDARGS= krb5_cv_build_krb4_libs=no @@ -243,8 +241,6 @@ else DEPKRB4_LIB='$(TOPLIBD)/libkrb4.a' KRB4_CRYPTO_LIB='-ldes425' DEPKRB4_CRYPTO_LIB='$(TOPLIBD)/libdes425.a' - KDB4_LIB='-lkdb4' - DEPKDB4_LIB='$(TOPLIBD)/libkdb4.a' KRB4_INCLUDES='-I$(SRCTOP)/include/kerberosIV' LDARGS= krb5_cv_build_krb4_libs=yes @@ -256,8 +252,6 @@ else DEPKRB4_LIB="$withval/lib/libkrb.a" KRB4_CRYPTO_LIB='-ldes425' DEPKRB4_CRYPTO_LIB='$(TOPLIBD)/libdes425.a' - KDB4_LIB="-lkdb" - DEPKDB4_LIB="$withval/lib/libkdb.a" KRB4_INCLUDES="-I$withval/include" LDARGS="-L$withval/lib" krb5_cv_build_krb4_libs=no @@ -805,12 +799,12 @@ else fi] dnl this is ugly, but it wouldn't be necessary if krb5 didn't abuse dnl configure so badly -SRVDEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadmsrv_deplib $gssrpc_deplib $gssapi_deplib $kdb5_deplib $kutil_deplib \[$](TOPLIBD)/libkrb5.a $kdb4_deplib $krb4_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib $dyn_deplib $db_deplib \[$](TOPLIBD)/libcom_err.a" -SRVLIBS="\[$](LOCAL_LIBRARIES) $kadmsrv_lib $gssrpc_lib $gssapi_lib $kdb5_lib $kdb4_lib $kutil_lib $krb4_lib -lkrb5 -lcrypto $ss_lib $dyn_lib $db_lib -lcom_err $LIBS" -CLNTDEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadmclnt_deplib $gssrpc_deplib $gssapi_deplib $kdb5_deplib $kutil_deplib \[$](TOPLIBD)/libkrb5.a $kdb4_deplib $krb4_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib $dyn_deplib $db_deplib \[$](TOPLIBD)/libcom_err.a" -CLNTLIBS="\[$](LOCAL_LIBRARIES) $kadmclnt_lib $gssrpc_lib $gssapi_lib $kdb5_lib $kdb4_lib $kutil_lib $krb4_lib -lkrb5 -lcrypto $ss_lib $dyn_lib $db_lib -lcom_err $LIBS" -DEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadmclnt_deplib $kadmsrv_deplib $gssrpc_deplib $gssapi_deplib $kdb5_deplib $kutil_deplib \[$](TOPLIBD)/libkrb5.a $kdb4_deplib $krb4_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib $dyn_deplib $db_deplib \[$](TOPLIBD)/libcom_err.a" -LIBS="\[$](LOCAL_LIBRARIES) $kadmclnt_lib $kadmsrv_lib $gssrpc_lib $gssapi_lib $kdb5_lib $kdb4_lib $kutil_lib $krb4_lib -lkrb5 -lcrypto $ss_lib $dyn_lib $db_lib -lcom_err $LIBS" +SRVDEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadmsrv_deplib $gssrpc_deplib $gssapi_deplib $kdb5_deplib $kutil_deplib \[$](TOPLIBD)/libkrb5.a $krb4_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib $dyn_deplib $db_deplib \[$](TOPLIBD)/libcom_err.a" +SRVLIBS="\[$](LOCAL_LIBRARIES) $kadmsrv_lib $gssrpc_lib $gssapi_lib $kdb5_lib $kutil_lib $krb4_lib -lkrb5 -lcrypto $ss_lib $dyn_lib $db_lib -lcom_err $LIBS" +CLNTDEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadmclnt_deplib $gssrpc_deplib $gssapi_deplib $kdb5_deplib $kutil_deplib \[$](TOPLIBD)/libkrb5.a $krb4_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib $dyn_deplib $db_deplib \[$](TOPLIBD)/libcom_err.a" +CLNTLIBS="\[$](LOCAL_LIBRARIES) $kadmclnt_lib $gssrpc_lib $gssapi_lib $kdb5_lib $kutil_lib $krb4_lib -lkrb5 -lcrypto $ss_lib $dyn_lib $db_lib -lcom_err $LIBS" +DEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadmclnt_deplib $kadmsrv_deplib $gssrpc_deplib $gssapi_deplib $kdb5_deplib $kutil_deplib \[$](TOPLIBD)/libkrb5.a $krb4_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib $dyn_deplib $db_deplib \[$](TOPLIBD)/libcom_err.a" +LIBS="\[$](LOCAL_LIBRARIES) $kadmclnt_lib $kadmsrv_lib $gssrpc_lib $gssapi_lib $kdb5_lib $kutil_lib $krb4_lib -lkrb5 -lcrypto $ss_lib $dyn_lib $db_lib -lcom_err $LIBS" LDFLAGS="$LDFLAGS -L\$(TOPLIBD)" AC_SUBST(LDFLAGS) AC_SUBST(LDARGS) @@ -1078,3 +1072,43 @@ else fi AC_SUBST(KRB5_RUN_ENV) ])dnl +dnl +dnl AC_KRB5_TCL - determine if the TCL library is present on system +dnl +AC_DEFUN(AC_KRB5_TCL,[ +TCL_INC= +TCL_LIB= +TCL_WITH= +AC_ARG_WITH(tcl, +[ --with-tcl=path where Tcl resides], + TCL_WITH=$withval + if test "$withval" != yes -a "$withval" != no ; then + TCL_INC=-I$withval/include + TCL_LIB=-L$withval/lib + fi) + +if test "$TCL_WITH" != no ; then + hold_cflags=$CPPFLAGS + hold_ldflags=$LDFLAGS + CPPFLAGS="$CPPFLAGS $TCL_INC" + LDFLAGS="$CPPFLAGS $TCL_LIB" + AC_CHECK_HEADER(tcl.h,dnl + AC_CHECK_LIB(tcl7.5, Tcl_CreateCommand, + TCL_LIB="$TCL_LIB -ltcl7.5", + AC_CHECK_LIB(tcl, Tcl_CreateCommand, + TCL_LIB="$TCL_LIB -ltcl", + AC_MSG_WARN("tcl.h found but not library"), + -lm), + -lm) + ,dnl If tcl.h not found + AC_MSG_WARN(Could not find Tcl which is needed for the kadm5 tests) + TCL_LIB= + ) + CPPFLAGS=$hold_cflags + LDFLAGS=$hold_ldflags + AC_SUBST(TCL_LIB) + AC_SUBST(TCL_INC) +else + AC_MSG_RESULT("Not looking for Tcl library") +fi +])dnl diff --git a/src/configure.in b/src/configure.in index a706cb171..6a245dfe9 100644 --- a/src/configure.in +++ b/src/configure.in @@ -241,6 +241,7 @@ krb5_cv_shlibs_tail_comp= krb5_cv_staticlibs_enabled=yes krb5_cv_shlibs_enabled=]) +AC_KRB5_TCL AC_ARG_ENABLE([athena], [ --enable-athena build with MIT Project Athena configuration],,) if test -z "$KRB4_LIB"; then -- 2.26.2