From: Niels Möller <nisse@lysator.liu.se>
Date: Fri, 21 Dec 2012 09:31:22 +0000 (+0100)
Subject: Merge branch 'master' of git.lysator.liu.se:/nettle/nettle
X-Git-Tag: nettle_2.6_release_20130116~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7522caffb5dd4cbbd680fcc0a3e4195f8d7637e;p=thirdparty%2Fnettle.git

Merge branch 'master' of git.lysator.liu.se:/nettle/nettle
---

d7522caffb5dd4cbbd680fcc0a3e4195f8d7637e
diff --cc ChangeLog
index 84efab31,cfae0a85..e1c23c7a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,13 +1,21 @@@
 +2012-12-20  Niels Möller  <nisse@lysator.liu.se>
 +
 +	From Tim Rühsen:
 +	* testsuite/des-compat-test.c (pt): Use proper prototype, use
 +	const.
 +	* testsuite/testutils.c (test_dsa_key): Deleted spurious
 +	semicolon.
 +
  2012-12-15  Niels Möller  <nisse@lysator.liu.se>
  
+ 	Based on a patch from Alon Bar-Lev:
+ 	* Makefile.in (LIBTARGETS, SHLIBTARGET): Define as empty if static
+ 	or shared libraries, respectively, are disabled.
+ 	(TARGETS): Deleted @IF_SHARED@ conditional, now in the definition
+ 	of SHLIBTARGET.
+ 
  	From Alon Bar-Lev:
- 	* configure.ac: Check for ar program.
+ 	* configure.ac: Check for ar program. New option --disable-static.
  	* config.make.in (AR): Use configured value.
  
  2012-12-13  Niels Möller  <nisse@lysator.liu.se>