Merge tag 'upstream/1.0' into debian

Upstream version 1.0

1 files changed, 23 insertions, 22 deletions

diff --git a/configure.ac b/configure.ac
index ffd7eeb..bb78702 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,19 +1,18 @@
 dnl Autoconf configuration for wallet.
 dnl
 dnl Written by Russ Allbery <rra@stanford.edu>
-dnl Copyright 2006, 2007, 2008, 2010
-dnl     Board of Trustees, Leland Stanford Jr. University
+dnl Copyright 2006, 2007, 2008, 2010, 2013
+dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
 dnl See LICENSE for licensing terms.
 
-dnl We cannot use -Wall -Werror with AM_INIT_AUTOMAKE since we override
-dnl distuninstallcheck (not supported by Perl).
 AC_PREREQ([2.64])
-AC_INIT([wallet], [0.12], [rra@stanford.edu])
+AC_INIT([wallet], [1.0], [rra@stanford.edu])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_LIBOBJ_DIR([portable])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.11 check-news silent-rules])
+AM_INIT_AUTOMAKE([1.11 check-news dist-xz foreign silent-rules subdir-objects
+    -Wall -Wno-override -Werror])
 AM_MAINTAINER_MODE
 
 AC_PROG_CC
@@ -22,6 +21,18 @@ AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 
+AC_ARG_WITH([wallet-server],
+    [AC_HELP_STRING([--with-wallet-server=HOST], [Default wallet server])],
+    [AS_IF([test x"$withval" != xno && test x"$withval" != xyes],
+        [AC_DEFINE_UNQUOTED([WALLET_SERVER], ["$withval"],
+            [Define to the default server host name.])])])
+AC_ARG_WITH([wallet-port],
+    [AC_HELP_STRING([--with-wallet-port=PORT],
+        [Default wallet server port])],
+    [AS_IF([test x"$withval" != xno && test x"$withval" != xyes],
+        [AC_DEFINE_UNQUOTED([WALLET_PORT], [$withval],
+            [Define to the default server port.])])])
+
 RRA_LIB_REMCTL
 RRA_LIB_KRB5
 RRA_LIB_KRB5_SWITCH
@@ -30,8 +41,9 @@ AC_CHECK_FUNCS([krb5_get_init_creds_opt_alloc \
     krb5_principal_get_realm])
 AC_CHECK_FUNCS([krb5_get_init_creds_opt_free],
     [RRA_FUNC_KRB5_GET_INIT_CREDS_OPT_FREE_ARGS])
+AC_CHECK_DECLS([krb5_kt_free_entry], [], [], [RRA_INCLUDES_KRB5])
 AC_CHECK_DECLS([krb5_kt_free_entry])
-AC_CHECK_MEMBERS([krb5_keytab_entry.keyblock], , , [#include <krb5.h>])
+AC_CHECK_MEMBERS([krb5_keytab_entry.keyblock], [], [], [RRA_INCLUDES_KRB5])
 RRA_LIB_KRB5_RESTORE
 
 AC_HEADER_STDBOOL
@@ -40,35 +52,24 @@ AC_CHECK_DECLS([snprintf, vsnprintf])
 RRA_C_C99_VAMACROS
 RRA_C_GNU_VAMACROS
 AC_TYPE_LONG_LONG_INT
+AC_CHECK_TYPES([ssize_t], [], [],
+    [#include <sys/types.h>])
 RRA_FUNC_SNPRINTF
 AC_CHECK_FUNCS([setrlimit])
 AC_REPLACE_FUNCS([asprintf mkstemp setenv strlcat strlcpy])
 
-AC_ARG_WITH([wallet-server],
-    [AC_HELP_STRING([--with-wallet-server=HOST], [Default wallet server])],
-    [AS_IF([test x"$withval" != xno && test x"$withval" != xyes],
-        [AC_DEFINE_UNQUOTED([WALLET_SERVER], ["$withval"],
-            [Define to the default server host name.])])])
-AC_ARG_WITH([wallet-port],
-    [AC_HELP_STRING([--with-wallet-port=PORT],
-        [Default wallet server port])],
-    [AS_IF([test x"$withval" != xno && test x"$withval" != xyes],
-        [AC_DEFINE_UNQUOTED([WALLET_PORT], [$withval],
-            [Define to the default server port.])])])
-
 AC_ARG_VAR([REMCTLD], [Path to the remctld binary])
 AC_PATH_PROG([REMCTLD], [remctld], , [$PATH:/usr/sbin:/usr/local/sbin])
 AS_IF([test x"$REMCTLD" != x],
     [AC_DEFINE_UNQUOTED([PATH_REMCTLD], ["$REMCTLD"],
         [Define to the full path to remctld to run remctl tests.])])
 
-dnl Create the tests/data directory for builds outside the source directory.
-AC_CONFIG_COMMANDS([tests/data/.placeholder], [touch tests/data/.placeholder])
-
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([Makefile perl/Makefile.PL])
 AC_CONFIG_FILES([tests/client/basic-t], [chmod +x tests/client/basic-t])
 AC_CONFIG_FILES([tests/client/full-t], [chmod +x tests/client/full-t])
 AC_CONFIG_FILES([tests/client/prompt-t], [chmod +x tests/client/prompt-t])
 AC_CONFIG_FILES([tests/client/rekey-t], [chmod +x tests/client/rekey-t])
+AC_CONFIG_COMMANDS([tests/config],
+    [test -d tests/config || mkdir tests/config])
 AC_OUTPUT