2 files changed, 8 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 32db644b2eb..ba801f024db 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-15  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (LDFLAGS): Explicitly set via configure.
+
 2014-06-15  Eli Zaretskii  <eliz@gnu.org>
 
         * Makefile.in (CPPFLAGS): Define.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index e35610d27fb..aff112d9e0d 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -28,7 +28,9 @@ EMACSOPT = -batch --no-site-file --no-site-lisp
 
 CC=@CC@
 CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+
 version=@version@
 ## Used in $archlibdir.
 configuration=@configuration@
@@ -192,6 +194,7 @@ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
               -I. -I../src -I../lib \
               -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib
 
+## FIXME?  What is LDFLAGS doing here?
 ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
 LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
 CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}