From 391f4f927e4bef8de9b470cbc86edfd0c039f463 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Mon, 8 Dec 2014 18:43:29 -0800 Subject: Release 1.2 Change-Id: I4157db0f690542db0eb1bfbcb7e15bfee890cd65 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7bd0585..7c687cf 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ dnl dnl See LICENSE for licensing terms. AC_PREREQ([2.64]) -AC_INIT([wallet], [1.1], [eagle@eyrie.org]) +AC_INIT([wallet], [1.2], [eagle@eyrie.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_LIBOBJ_DIR([portable]) AC_CONFIG_MACRO_DIR([m4]) -- cgit v1.2.3 From f154a7b373491eff28e3a062e6f5fd9870a7ea0c Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Mon, 8 Dec 2014 20:23:01 -0800 Subject: Be more robust when setting up the Perl tests If the Test library directory already exists, we previously failed. Use mkdir -p and probe for it in Autoconf to avoid this. Change-Id: I1ad9f1a83af1f2ebfe1b2337aaab99913b4edeea --- Makefile.am | 3 +-- configure.ac | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/Makefile.am b/Makefile.am index d6409ea..553af64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -205,9 +205,8 @@ perl/blib/lib/Wallet/Config.pm: $(srcdir)/perl/lib/Wallet/Config.pm cp "$(srcdir)/$$f" "$(builddir)/$$f" ; \ done ; \ fi - mkdir perl/t/lib/Test + $(MKDIR_P) perl/t/lib/Test/RRA $(INSTALL_DATA) $(srcdir)/tests/tap/perl/Test/RRA.pm perl/t/lib/Test/ - mkdir perl/t/lib/Test/RRA $(INSTALL_DATA) $(srcdir)/tests/tap/perl/Test/RRA/Config.pm \ perl/t/lib/Test/RRA/ cd perl && perl Build.PL $(WALLET_PERL_FLAGS) diff --git a/configure.ac b/configure.ac index 7c687cf..4efc5d7 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,7 @@ AM_PROG_CC_C_O m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) AC_PROG_INSTALL AC_PROG_RANLIB +AC_PROG_MKDIR_P dnl Allow modification of the default wallet port, and setting a default dnl wallet server when none is defined in krb5.conf. -- cgit v1.2.3