From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 22 Aug 2014 16:48:24 +0000 (+0200)
Subject: [master] Merge branch 'trac3511' (pkg-config dependency removal)
X-Git-Tag: trac3482_base~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e1f718a7dd33ebd03f3730ea2bb48f529472b74;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3511' (pkg-config dependency removal)

Conflicts:
	ChangeLog
---

0e1f718a7dd33ebd03f3730ea2bb48f529472b74
diff --cc ChangeLog
index 21a0d8f3c1,5f9c01c6f3..33ce79ea14
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,6 +1,23 @@@
 -8xx.	[build]		jreed
++828.	[build]		jreed
+ 	The configure script no longer requires pkg-config.
 -	(Trac #3511, git tbd)
++	(Trac #3511, git 99a5a2db8c011b358873d485ac48f7c78ac6374c)
++
 +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)
 +
 +824.	[bug]		marcin
 +	Kea deamons report configuration summary when the configuration is
 +	applied successfully.
 +	(Trac #3477, git f39d208024f720f72c931016cfa50a54e80f8c61)
  
  823.	[build]		tomek
  	query_cmp tool removed from the source code.