From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 21 Aug 2014 17:25:09 +0000 (+0200)
Subject: [master] Merge branch 'trac3525' (AC_PROG_LIBTOOL => LT_INIT)
X-Git-Tag: trac3482_base~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e9e28dc099d1c2a417a830eb879b8b60d2fd38e;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3525' (AC_PROG_LIBTOOL => LT_INIT)

Conflicts:
	AUTHORS
	ChangeLog
---

4e9e28dc099d1c2a417a830eb879b8b60d2fd38e
diff --cc AUTHORS
index b07adc0c99,02529fb625..45e3b23b57
--- a/AUTHORS
+++ b/AUTHORS
@@@ -56,7 -56,7 +56,8 @@@ We have received the following contribu
  
   - Jiri Popelka from Red Hat
     2014-08: config files examples permission fix
 +   2014-08: compilation fix for armv7
+    2014-08: configure.ac update: AC_PROG_LIBTOOL => LT_INIT
  
  Kea uses log4cplus (http://sourceforge.net/projects/log4cplus/) for logging,
  Boost (http://www.boost.org/) library for almost everything, and can use Botan
diff --cc ChangeLog
index 96844147d0,cbd7c345a6..21a0d8f3c1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,11 @@@
 -826.	[build]		jiri, tomek
++827.	[build]		jiri, tomek
+ 	Deprecated AC_PROG_LIBTOOL macro replaced by LT_INIT.
+ 	(Trac #3525, git 6c0aacf29fae1d0501ca69ff6324df8d4fc8c7ee)
++
 +826.	[bug]		jiri, tomek
 +	Compilation fix for Red Hat running on armv7.
 +	(Trac #3526, git eac5a80472dcb78b538c2ed34cc0534f801e5145)
 +
  825.	[bug]		jiri, tomek
  	Example JSON configuration files permission fix.
  	(Trac #3524, git 822a39ba33870f70787a1f666aed772e06d04d79)