remove CopyOnWrite2 and unused vars

[openafs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5c1cd35..588b50a 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,8 +17,6 @@ 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)
 
 dnl If the user hasn't specified CFLAGS don't let configure pick -g -O2
@@ -76,12 +73,15 @@ AS_IF([test x"$KRB5_LIBS" != x],
                      [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
@@ -102,6 +102,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               \
@@ -109,6 +119,8 @@ ${MAN_MAKEFILE} \
 ${ADMINGUIDE_MAKEFILE} \
 ${QSUNIX_MAKEFILE} \
 ${USERGUIDE_MAKEFILE} \
+${ADMINREF_MAKEFILE} \
+${MOBI_FIXUP_XSL} \
 src/afs/Makefile \
 src/afsd/Makefile \
 src/afsmonitor/Makefile \
@@ -140,6 +152,7 @@ src/config/Makefile.version-NOCML \
 src/config/shlib-build \
 src/config/shlib-install \
 src/crypto/hcrypto/Makefile \
+src/crypto/rfc3961/Makefile \
 src/dir/Makefile \
 src/dir/test/Makefile \
 src/dviced/Makefile \
@@ -177,6 +190,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 \
@@ -184,7 +198,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 \
@@ -226,6 +239,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 \
@@ -239,9 +253,14 @@ 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])