aklog: can't assume krb5_524_conv_principal based on convert_creds

[openafs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9f42d8e..3eb836f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,6 @@ AM_INIT_AUTOMAKE
 
 AC_CONFIG_HEADER(src/config/afsconfig.h)
 MACOS_VERSION=1.5.76
-LINUX_PKGVER=1.5.76
 #LINUX_PKGREL=0.pre3
 LINUX_PKGREL=1.1
 
@@ -18,14 +17,13 @@ if echo "$LINUX_PKGREL" | grep pre >/dev/null 2>/dev/null ; then
 fi
 
 AC_SUBST(MACOS_VERSION)
-AC_SUBST(LINUX_PKGVER)
-AC_SUBST(LINUX_PKGREL)
 AC_SUBST(DEB_PKGVER)
 
-AC_USE_SYSTEM_EXTENSIONS
-
 dnl If the user hasn't specified CFLAGS don't let configure pick -g -O2
 AS_IF([test -z "$CFLAGS"], [CFLAGS=" "], [])
+
+AC_USE_SYSTEM_EXTENSIONS
+
 AC_PROG_CC
 
 AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib])
@@ -58,6 +56,7 @@ AS_IF([test x"$KRB5_LIBS" != x],
         add_to_error_table \
         encode_krb5_enc_tkt_part \
         encode_krb5_ticket \
+       krb5_524_conv_principal \
         krb5_allow_weak_crypto \
         krb5_c_encrypt \
         krb5_decode_ticket \
@@ -71,16 +70,22 @@ AS_IF([test x"$KRB5_LIBS" != x],
              [AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc],
                  [LIBS="-lkrb524 $LIBS"
                   KRB5_LIBS="-lkrb524 $KRB5_LIBS"
+                 AC_CHECK_LIB([krb524], [krb5_524_conv_principal],
+                 [AC_DEFINE([HAVE_KRB5_524_CONV_PRINCIPAL], 1,
+                    [Define to 1 if you have the `krb5_524_conv_principal' function.])])
                   AC_DEFINE([HAVE_KRB524_CONVERT_CREDS_KDC], 1,
                      [Define to 1 if you have the `krb524_convert_creds_kdc' function.])])])])
      AC_CHECK_HEADERS([kerberosIV/krb.h])
      AC_CHECK_HEADERS([kerberosV/heim_err.h])
-     AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.session,
+     AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.keyblock.enctype, krb5_creds.session,
                        krb5_prompt.type], , , [#include <krb5.h>])
      RRA_LIB_KRB5_RESTORE])
 AC_SUBST([BUILD_KRB5])
 AC_SUBST([MAKE_KRB5])
 
+dnl Probe for GSSAPI
+RRA_LIB_GSSAPI
+
 if test -d 'doc/man-pages' ; then
     MAN_MAKEFILE="doc/man-pages/Makefile doc/man-pages/install-man"
 else
@@ -101,6 +106,16 @@ if test -f 'doc/xml/UserGuide/Makefile.in' ; then
 else
    USERGUIDE_MAKEFILE=
 fi
+if test -f 'doc/xml/AdminRef/Makefile.in' ; then
+   ADMINREF_MAKEFILE="doc/xml/AdminRef/Makefile"
+else
+   ADMINREF_MAKEFILE=
+fi
+if test -f 'doc/xml/mobi-fixup.xsl.in' ; then
+   MOBI_FIXUP_XSL="doc/xml/mobi-fixup.xsl"
+else
+   MOBI_FIXUP_XSL=
+fi
 
 AC_OUTPUT(             \
 Makefile               \
@@ -108,6 +123,8 @@ ${MAN_MAKEFILE} \
 ${ADMINGUIDE_MAKEFILE} \
 ${QSUNIX_MAKEFILE} \
 ${USERGUIDE_MAKEFILE} \
+${ADMINREF_MAKEFILE} \
+${MOBI_FIXUP_XSL} \
 src/afs/Makefile \
 src/afsd/Makefile \
 src/afsmonitor/Makefile \
@@ -139,8 +156,7 @@ src/config/Makefile.version-NOCML \
 src/config/shlib-build \
 src/config/shlib-install \
 src/crypto/hcrypto/Makefile \
-src/des/Makefile \
-src/des/test/Makefile \
+src/crypto/rfc3961/Makefile \
 src/dir/Makefile \
 src/dir/test/Makefile \
 src/dviced/Makefile \
@@ -178,6 +194,7 @@ src/log/Makefile \
 src/log/test/Makefile \
 src/lwp/Makefile \
 src/lwp/test/Makefile \
+src/opr/Makefile \
 src/packaging/Debian/changelog \
 src/packaging/MacOS/OpenAFS-debug.Description.plist \
 src/packaging/MacOS/OpenAFS-debug.Info.plist \
@@ -185,7 +202,6 @@ src/packaging/MacOS/OpenAFS.Description.plist \
 src/packaging/MacOS/OpenAFS.Info.plist \
 src/packaging/MacOS/OpenAFS.info \
 src/packaging/MacOS/buildpkg.sh \
-src/packaging/RedHat/openafs.spec \
 src/pam/Makefile \
 src/platform/Makefile \
 src/platform/${MKAFS_OSTYPE}/Makefile \
@@ -194,6 +210,7 @@ src/procmgmt/Makefile \
 src/procmgmt/test/Makefile \
 src/ptserver/Makefile \
 src/tptserver/Makefile \
+src/roken/Makefile \
 src/rx/Makefile \
 src/rx/bulk.example/Makefile \
 src/rx/bulktest/Makefile \
@@ -204,6 +221,7 @@ src/rxdebug/Makefile \
 src/rxgen/Makefile \
 src/rxkad/Makefile \
 src/rxkad/test/Makefile \
+src/rxosd/Makefile \
 src/rxstat/Makefile \
 src/scout/Makefile \
 src/sgistuff/Makefile \
@@ -213,9 +231,11 @@ src/sys/Makefile \
 src/tbutc/Makefile \
 src/tests/Makefile \
 src/tests/run-tests \
+src/tools/Makefile \
+src/tools/dumpscan/Makefile \
+src/tools/rxperf/Makefile \
 src/tsalvaged/Makefile \
 src/tsm41/Makefile \
-src/tviced/Makefile \
 src/tvolser/Makefile \
 src/ubik/Makefile \
 src/tubik/Makefile \
@@ -225,6 +245,7 @@ src/usd/test/Makefile \
 src/uss/Makefile \
 src/util/Makefile \
 src/util/test/Makefile \
+src/libafscp/Makefile \
 src/venus/Makefile \
 src/venus/test/Makefile \
 src/vfsck/Makefile \
@@ -237,9 +258,18 @@ src/volser/Makefile \
 src/xstat/Makefile \
 src/helper-splint.sh \
 tests/Makefile \
+tests/auth/Makefile \
+tests/cmd/Makefile \
+tests/common/Makefile \
+tests/opr/Makefile \
 tests/rpctestlib/Makefile \
+tests/rx/Makefile \
 tests/tap/Makefile \
-tests/util/Makefile,
+tests/util/Makefile \
+tests/volser/Makefile,
 
 [chmod a+x src/config/shlib-build
  chmod a+x src/config/shlib-install])
+
+# print a final summary
+SUMMARY