From: Benno Schulenberg <bensberg@justemail.net>
Date: Mon, 16 Jun 2014 12:06:58 +0000 (+0000)
Subject: Making sure the compiler also links against libz, which is used by libmagic.
X-Git-Tag: v2.3.5~93
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=ca9abd82165bd055f0a3e8857062e013336e3126;p=nano.git

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
---

diff --git a/ChangeLog b/ChangeLog
index f8b55a18..f1ce1a39 100644
--- 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
index c76cd09f..9baa1987 100644
--- 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.