Include memxor unconditionally, not via LIBOBJS.

diff --git a/ChangeLog b/ChangeLog
index a6a216d67cb8d3adf1fa936469a6dc76d9605a2c..d53197fd616c1e5711fcf425dfb967112d829eec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2013-04-24  Niels Möller  <nisse@lysator.liu.se>
 
+       * Makefile.in (nettle_OBJS): Deleted $(LIBOBJS), and also deleted
+       LIBOBJS substitution.
+       (nettle_SOURCES): Added memxor.c, to include it in the library
+       unconditionally.
+
+       * configure.ac: Deleted AC_REPLACE_FUNCS for memxor.
+
        * Released nettle-2.7.
 
 2013-04-23  Niels Möller  <nisse@lysator.liu.se>

diff --git a/Makefile.in b/Makefile.in
index cbc001c79ec00aad3af24bc73b720c882328c8cb..2b4f3e5fed81f71c8a93d4b87e9cf26490ab62f2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,8 +5,6 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
-LIBOBJS = @LIBOBJS@
-
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -84,6 +82,7 @@ nettle_SOURCES = aes-decrypt-internal.c aes-decrypt.c \
                 knuth-lfib.c \
                 md2.c md2-meta.c md4.c md4-meta.c \
                 md5.c md5-compress.c md5-compat.c md5-meta.c \
+                memxor.c \
                 gosthash94.c \
                 ripemd160.c ripemd160-compress.c ripemd160-meta.c \
                 salsa20-core-internal.c \
@@ -180,7 +179,7 @@ DISTFILES = $(SOURCES) $(HEADERS) getopt.h .bootstrap run-tests \
        nettle.texinfo nettle.info nettle.html nettle.pdf sha-example.c
 
 # Rules building static libraries
-nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) $(LIBOBJS)
+nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT))
 nettle_PURE_OBJS = $(nettle_OBJS:.$(OBJEXT)=.p$(OBJEXT))
 
 hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_SOURCES:.asm=.$(OBJEXT))

diff --git a/configure.ac b/configure.ac
index 232aa9cbec7bfdfb5e440b409be3cda3a2176a61..7509ee622a17a0c5dc15e3e5af1003d3d5d011eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -606,9 +606,7 @@ AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h]
 LSH_FUNC_ALLOCA
 LSH_FUNC_STRERROR
 
-# Needed by the supplied memcmp.c
 AC_C_BIGENDIAN
-AC_REPLACE_FUNCS(memxor)
 
 LSH_GCC_ATTRIBUTES