From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 15 Aug 2011 20:06:33 +0000 (+0200)
Subject: Fix test_args_to_config crash on some platform.
X-Git-Tag: v1.6.1~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7446e5111bba02d83c6028a3e7b4928a72916564;p=yubikey-personalization

Fix test_args_to_config crash on some platform.
---

diff --git a/NEWS b/NEWS
index e43331a..c267616 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ Yubikey-personalize NEWS -- History of user-visible changes.     -*- outline -*-
 
 * Version 1.6.1 (unreleased)
 
+** Fix test_args_to_config crash on some platform.
+The problem was due to mixing PIC and non-PIC object code.
+
 * Version 1.6.0 (released 2011-07-20)
 
 ** Accept firmware version 2.3.x too.
diff --git a/configure.ac b/configure.ac
index 2e4a460..7142a3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-AC_INIT([yubikey-personalization], [1.6.0],
+AC_INIT([yubikey-personalization], [1.6.1],
   [yubico-devel@googlegroups.com], [ykpers],
   [http://code.google.com/p/yubikey-personalization/])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -37,7 +37,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # Interfaces added:                             AGE++
 # Interfaces removed:                           AGE=0
 AC_SUBST(LT_CURRENT, 7)
-AC_SUBST(LT_REVISION, 0)
+AC_SUBST(LT_REVISION, 1)
 AC_SUBST(LT_AGE, 6)
 
 AM_INIT_AUTOMAKE([-Wall -Werror])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7070d1f..989f11d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,12 +31,11 @@ AM_LDFLAGS = -no-install -static
 AM_CFLAGS=-I$(srcdir)/.. -I$(srcdir)/../ykcore
 LDADD = ../libykpers-1.la
 
-ykpersonalize_LDADD = ../libykpers-1.la ../ykcore/libykcore.la
-
 ctests = selftest$(EXEEXT) test_args_to_config$(EXEEXT) test_key_generation$(EXEEXT)
 check_PROGRAMS = $(ctests)
 TESTS = $(ctests)
 
-test_args_to_config_LDADD = ../ykpers-args.o $(LDADD) $(ykpersonalize_LDADD)
+test_args_to_config_SOURCES = test_args_to_config.c \
+	../ykpers-args.h ../ykpers-args.c
 
 TESTS_ENVIRONMENT = $(VALGRIND)