[Nickle] nickle: Branch 'master' - 2 commits

[Keith Packard]

 Makefile.am      |    2 ++
 configure.ac     |    8 ++++----
 debian/changelog |    6 ++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit b5b890e744a71ded3cb4164e70be6fb0c3c9bbee
Author: Keith Packard <keithp at keithp.com>
Date:   Sat Dec 2 22:22:04 2023 -0800

    Version 2.96
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 1df08e0..4430864 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl for licensing information.
 
 AC_PREREQ([2.69])
 
-AC_INIT([nickle],[2.95],[http://nickle.org],[nickle])
+AC_INIT([nickle],[2.96],[http://nickle.org],[nickle])
 RELEASE_DATE="2023-12-02"
 AC_CONFIG_SRCDIR([nickle.h])
 AC_CONFIG_HEADERS([nickle-config.h])
diff --git a/debian/changelog b/debian/changelog
index c284721..1b5ae50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nickle (2.96) unstable; urgency=medium
+
+  * Fix LDFLAGS in debian package.
+
+ -- Keith Packard <keithp at keithp.com>  Sat, 02 Dec 2023 22:21:27 -0800
+
 nickle (2.95) unstable; urgency=medium
 
   * Handle empty objects and arrays in JSON input
commit b751f344a3445aa920b2db2116c71f72fd075d4a
Author: Keith Packard <keithp at keithp.com>
Date:   Sat Dec 2 22:19:13 2023 -0800

    Leave LDFLAGS for the build environment
    
    Debian wants to pass -Wl,-z,relro to configure through LDFLAGS, so
    if we smash it that gets lots. Instead, use a new NICKLE_LDFLAGS
    variable and add that to AM_LDFLAGS in Makefile.am
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/Makefile.am b/Makefile.am
index 3d97551..ba28ec9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,6 +70,8 @@ AM_CFLAGS = \
 	-Wmissing-prototypes -Wmissing-declarations \
 	-Wnested-externs -fno-strict-aliasing -fwrapv
 
+AM_LDFLAGS = $(NICKLE_LDFLAGS)
+
 USES_GRAM_H = \
 	array.o \
 	compile.o \
diff --git a/configure.ac b/configure.ac
index b8790e7..1df08e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,12 +60,12 @@ AC_DEFUN([AS_COMPILER_FLAG],
 ])
 
 AS_COMPILER_FLAG([-Wl,-E], GCC_EXTERN="yes", GCC_EXTERN="no")
+NICKLE_LDFLAGS=""
 if test $GCC_EXTERN = yes; then
-	LDFLAGS="-Wl,-E"
+	NICKLE_LDFLAGS="-Wl,-E"
 	AC_DEFINE([HAVE_EXTERN_SYMS], 1, [C compilers can extern program symbols])
-else
-	LDFLAGS=""
 fi
+AC_SUBST(NICKLE_LDFLAGS)
 
 dnl Checks for header files.
 AC_HEADER_STDC