nano

commit ca9abd82165bd055f0a3e8857062e013336e3126
parent 948b8e9bcfda6d4a789f4635ccc4c43ddb782e37
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Mon, 16 Jun 2014 12:06:58 +0000

Making sure the compiler also links against libz, which is used by libmagic.
This fixes Savannah bug #38378, reported by Alan Hourihane.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4967 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

Diffstat:
M
ChangeLog
 | 
5
+++++
M
configure.ac
 | 
2
++

2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-16  Benno Schulenberg  <bensberg@justemail.net>
+	* configure.ac: For the sake of statically linked systems, make sure
+	the compiler also links against libz, which is used by libmagic.
+	This fixes Savannah bug #38378, reported by Alan Hourihane.
+
 2014-06-14  Mark Majeres  <mark@engine12.com>
 	* src/nano.h, src/text.c (undo_cut, update_undo): When undoing a
 	backwards cut, put the cursor back in front of it, where it was.
diff --git a/configure.ac b/configure.ac
@@ -649,6 +649,8 @@ AC_MSG_WARN([*** Can't check for macro redefinability when cross-compiling]))
 AS_IF([test "x$enable_libmagic" != "xno"], [
   AC_CHECK_HEADERS_ONCE([magic.h])
   AC_CHECK_LIB(magic, magic_open)
+  AC_CHECK_HEADERS_ONCE([zlib.h])
+  AC_CHECK_LIB(z, inflate)
 ])
 
 # Check for groff html support.