move around cgywin et al
(LIB_kdb): set at the end of krb4-block (krb4): test for krb_enable_debug and krb_disable_debug git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6344 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
23
configure.in
23
configure.in
@@ -35,15 +35,15 @@ case "$host" in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
AC_CYGWIN
|
|
||||||
AC_OBJEXT
|
|
||||||
AC_EXEEXT
|
|
||||||
|
|
||||||
test -z "$CFLAGS" && CFLAGS="-g"
|
test -z "$CFLAGS" && CFLAGS="-g"
|
||||||
|
|
||||||
dnl Checks for programs.
|
dnl Checks for programs.
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
|
|
||||||
|
AC_CYGWIN
|
||||||
|
AC_OBJEXT
|
||||||
|
AC_EXEEXT
|
||||||
|
|
||||||
dnl AC_KRB_PROG_YACC
|
dnl AC_KRB_PROG_YACC
|
||||||
AC_PROG_YACC
|
AC_PROG_YACC
|
||||||
AM_PROG_LEX
|
AM_PROG_LEX
|
||||||
@@ -74,11 +74,6 @@ AC_TEST_PACKAGE_NEW(krb4,[#include <krb.h>],-lkrb,-ldes,/usr/athena)
|
|||||||
|
|
||||||
LIB_kdb=
|
LIB_kdb=
|
||||||
if test "$with_krb4" != "no"; then
|
if test "$with_krb4" != "no"; then
|
||||||
LIB_kdb="-lkdb -lkrb"
|
|
||||||
if test "$krb4_libdir"; then
|
|
||||||
LIB_krb4="-rpath $krb4_libdir $LIB_krb4"
|
|
||||||
LIB_kdb="-rpath $krb4_libdir -L$krb4_libdir $LIB_kdb"
|
|
||||||
fi
|
|
||||||
EXTRA_LIB45=lib45.a
|
EXTRA_LIB45=lib45.a
|
||||||
AC_SUBST(EXTRA_LIB45)
|
AC_SUBST(EXTRA_LIB45)
|
||||||
AC_CACHE_CHECK(for four valued krb_put_int, ac_cv_func_krb_put_int_four,
|
AC_CACHE_CHECK(for four valued krb_put_int, ac_cv_func_krb_put_int_four,
|
||||||
@@ -112,6 +107,16 @@ if test "$with_krb4" != "no"; then
|
|||||||
AC_DEFINE(KRB_VERIFY_SECURE_FAIL, 2,
|
AC_DEFINE(KRB_VERIFY_SECURE_FAIL, 2,
|
||||||
[Define to two if your krb.h doesn't])
|
[Define to two if your krb.h doesn't])
|
||||||
fi
|
fi
|
||||||
|
save_LIBS="$LIBS"
|
||||||
|
LIBS="$LIB_krb4 $LIBS"
|
||||||
|
AC_FIND_FUNC(krb_enable_debug)
|
||||||
|
AC_FIND_FUNC(krb_disable_debug)
|
||||||
|
LIBS="$save_LIBS"
|
||||||
|
LIB_kdb="-lkdb -lkrb"
|
||||||
|
if test "$krb4_libdir"; then
|
||||||
|
LIB_krb4="-rpath $krb4_libdir $LIB_krb4"
|
||||||
|
LIB_kdb="-rpath $krb4_libdir -L$krb4_libdir $LIB_kdb"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(KRB4, test "$with_krb4" != "no")
|
AM_CONDITIONAL(KRB4, test "$with_krb4" != "no")
|
||||||
AM_CONDITIONAL(KRB5, true)
|
AM_CONDITIONAL(KRB5, true)
|
||||||
|
Reference in New Issue
Block a user