PERLUAFS: Modernize lang-specific swig typemaps

[openafs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 81a677a..087cae1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,18 +9,10 @@ AC_CONFIG_SRCDIR([src/config/stds.h])
 AM_INIT_AUTOMAKE([foreign])
 
 AC_CONFIG_HEADER([src/config/afsconfig.h])
-MACOS_VERSION=1.5.76
-#LINUX_PKGREL=0.pre3
-LINUX_PKGREL=1.1
-
-dnl Debian wants the release candidate version in the main upstream version,
-dnl and wants ~ before it.
-DEB_PKGVER=m4_esyscmd([build-tools/git-version .])
-AS_IF([echo "$LINUX_PKGREL" | grep pre >/dev/null 2>/dev/null],
-    [DEB_PKGVER="$DEB_PKGVER"`echo "$LINUX_PKGREL" | sed 's/0.pre/~rc/'`])
+MACOS_VERSION=1.8.0fc1
+LINUX_PKGREL=1.8.0pre1
 
 AC_SUBST([MACOS_VERSION])
-AC_SUBST([DEB_PKGVER])
 
 dnl If the user hasn't specified CFLAGS don't let configure pick -g -O2
 AS_IF([test -z "$CFLAGS"], [CFLAGS=" "])
@@ -67,6 +59,8 @@ AS_IF([test x"$KRB5_LIBS" != x],
        krb5_c_encrypt \
        krb5_decode_ticket \
        krb5_enctype_enable \
+       krb5_free_keytab_entry_contents \
+       krb5_free_unparsed_name \
        krb5_get_init_creds_opt_alloc \
        krb5_get_prompt_types \
        krb5_princ_size \
@@ -94,6 +88,8 @@ AS_IF([test x"$KRB5_LIBS" != x],
        [AC_MSG_ERROR([Cannot find a usable com_err.h])])
      AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.keyblock.enctype, krb5_creds.session,
                       krb5_prompt.type], [], [], [#include <krb5.h>])
+     AC_CHECK_MEMBERS([krb5_keytab_entry.key, krb5_keytab_entry.keyblock],
+                     [], [], [#include <krb5.h>])
 dnl If we have krb5_creds.session, we are using heimdal
 dnl If we're using heimdal, aklog needs libasn1 for encode_EncTicketPart and a
 dnl few other functions. But just aklog; not any of the other stuff that uses
@@ -110,6 +106,21 @@ AC_SUBST([AKLOG_KRB5_LIBS])
 
 dnl Probe for GSSAPI
 RRA_LIB_GSSAPI
+dnl Check for the characteristics of whatever GSSAPI we found, if we found one
+BUILD_GSSAPI=no
+AS_IF([test x"$GSSAPI_LIBS" != x],
+    [BUILD_GSSAPI=yes
+     RRA_LIB_GSSAPI_SWITCH
+     AC_CHECK_FUNCS([gss_pseudo_random \
+       krb5_gss_register_acceptor_identity \
+       gss_krb5_ccache_name \
+     ])
+dnl We only need gssapi for rxgk (at this point).  rxgk requires pseudo_random.
+     AS_IF([test x"$ac_cv_func_gss_pseudo_random" != xyes],
+          [BUILD_GSSAPI=no])
+     RRA_LIB_GSSAPI_RESTORE
+])
+AC_SUBST([BUILD_GSSAPI])
 
 dnl Checks for summary
 OPENAFS_SUMMARY_CHECK_NAMEI
@@ -132,6 +143,9 @@ AS_IF([test -f 'doc/xml/AdminRef/Makefile.in'],
 AS_IF([test -f 'doc/xml/mobi-fixup.xsl.in'],
     [MOBI_FIXUP_XSL="doc/xml/mobi-fixup.xsl"],
     [MOBI_FIXUP_XSL=])
+AS_IF([test -f 'doc/doxygen/Doxyfile.in'],
+    [DOXYFILE="doc/doxygen/Doxyfile"],
+    [DOXYFILE=])
 
 AC_OUTPUT([
     Makefile
@@ -141,6 +155,7 @@ AC_OUTPUT([
     ${USERGUIDE_MAKEFILE}
     ${ADMINREF_MAKEFILE}
     ${MOBI_FIXUP_XSL}
+    ${DOXYFILE}
     src/afs/Makefile
     src/afsd/Makefile
     src/afsmonitor/Makefile
@@ -168,7 +183,6 @@ AC_OUTPUT([
     src/config/Makefile.lwp
     src/config/Makefile.lwptool
     src/config/Makefile.pthread
-    src/config/Makefile.shared
     src/config/Makefile.version-CML
     src/config/Makefile.version-NOCML
     src/config/shlib-build
@@ -213,13 +227,13 @@ AC_OUTPUT([
     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
     src/packaging/MacOS/OpenAFS.Description.plist
     src/packaging/MacOS/OpenAFS.Info.plist
     src/packaging/MacOS/OpenAFS.info
     src/packaging/MacOS/buildpkg.sh
+    src/packaging/MacOS/pkgbuild.sh
     src/pam/Makefile
     src/platform/Makefile
     src/platform/${MKAFS_OSTYPE}/Makefile
@@ -237,12 +251,12 @@ AC_OUTPUT([
     src/rx/test/Makefile
     src/rxdebug/Makefile
     src/rxgen/Makefile
+    src/rxgk/Makefile
     src/rxkad/Makefile
     src/rxkad/test/Makefile
     src/rxosd/Makefile
     src/rxstat/Makefile
     src/scout/Makefile
-    src/sgistuff/Makefile
     src/sys/Makefile
     src/tbutc/Makefile
     src/tests/Makefile