Some comments below. I suspect there will be breakage, but we shouldn't be afraid of changes like this...
Indeed, and I can wait with commiting it until Mats, and who ever else has weirdo platforms can confirm that it works. > AC_HELP_STRING([--with-krb4[[=PATH]]], Should be AS_HELP_STRING? Yeah, it should. > -dnl FIXME: Make this test case a bit more robust. Remove KRB4 > -LIBAUTH= > -INCAUTH= > -if test "$enable_encryption" = yes \ > - || test "$enable_authentication" = yes; then > - AH_TEMPLATE(KERBEROS, [Define to one if you have Kerberos]) > - AH_TEMPLATE(KRB4, [Define to one if you have Kerberos IV]) > - AH_TEMPLATE(KRB5, [Define to one if you have Kerberos V]) > - AH_TEMPLATE(SHISHI, [Define to 1 if you have Shishi]) > - AH_TEMPLATE(DES_ENCRYPTION, [FIXME]) > - > - case $KERBEROS_VERSION in > - 4) > - AC_CHECK_LIB(krb, krb_mk_req, > - LIBAUTH=-lkrb > - AC_DEFINE([KRB4]), > - -L$KERBEROS_DIR) > - if test ".$LIBAUTH" != . ; then > - AC_CHECK_LIB(des, des_key_sched, > - [LIBAUTH="$LIBAUTH -ldes"], > - -L$KERBEROS_DIR) > - dnl FIXME: Fix this to one test case. > - test "$enable_authentication" = yes \ > - && test "$ac_cv_lib_krb_krb_mk_req" = yes \ > - && AC_DEFINE([KRB4]) > - > - test "$enable_authentication" = yes \ > - && test "$ac_cv_lib_krb_krb_mk_req" = yes \ > - && AC_DEFINE([KERBEROS]) > - > - test "$enable_encryption" = yes \ > - && test "$ac_cv_lib_des_des_key_sched" = yes \ > - && AC_DEFINE([DES_ENCRYPTION]) > - fi > - ;; > - 5) > - IU_CHECK_KRB5($KERBEROS_VERSION,$KERBEROS_DIR) > - LIBAUTH="$KRB5_LIBS" # FIXME > - INCAUTH=$KRB5_CFLAGS > - if test ".$LIBAUTH" != . ;then > - AC_DEFINE([KERBEROS]) > - AC_DEFINE([KRB5]) > - fi > - ;; > - *) > - if test x$KERBEROS_DIR != x; then > - LIBAUTH=-L$KERBEROS_DIR/lib > - INCAUTH=-I$KERBEROS_DIR/include > - fi > - LIBAUTH="$LIBAUTH -lshishi" > - save_LIBS=$LIBS > - LIBS="$LIBS $LIBAUTH" > - save_CPPFLAGS=$CPPFLAGS > - CPPFLAGS="$CPPFLAGS $INCAUTH" > - AC_CHECK_HEADER(shishi.h, > - AC_CHECK_LIB(shishi, shishi_check_version, > - AC_DEFINE([SHISHI]), > - [INCAUTH= LIBAUTH=])) > - LIBS=$save_LIBS > - CPPFLAGS=$save_CPPFLAGS > - esac > -fi > -AC_SUBST(LIBAUTH) > -AC_SUBST(INCAUTH) > - > -dnl Define CPP macros that enable auth/encrypt code > -if test ".$LIBAUTH" != .; then > - test "$enable_authentication" = yes && AC_DEFINE([AUTHENTICATION], 1, > - [Define to one if you want authentication.]) > - test "$enable_encryption" = yes && AC_DEFINE([ENCRYPTION], 1, > - [Define to one if you want encryption.]) > -fi I think this parts needs to stay. Or was it replaced by some logic elsewhere? I didn't see that. Yup it should stay, work in progress. :-) I'm trying to figure out a nice way to test all strange combinations of switches and such automatically. I'd like to get a "basic" build going first and then revisit all the #if macros that we use in the source code.
