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

diff --cc ChangeLog
index 84efab31da19eb83214158ceb520635d1009a6bd,cfae0a85a21a39443f96bef81ce34003996783a2..e1c23c7a1abdf0e96ed5e7f807f825fbb95fc964
--- 1/ChangeLog
--- 2/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>