]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac3511' (pkg-config dependency removal)
authorTomek Mrugalski <tomasz@isc.org>
Fri, 22 Aug 2014 16:48:24 +0000 (18:48 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Fri, 22 Aug 2014 16:48:24 +0000 (18:48 +0200)
Conflicts:
ChangeLog

1  2 
ChangeLog
configure.ac

diff --cc ChangeLog
index 21a0d8f3c191363c0ac5f58510ae051a463830e9,5f9c01c6f3e424448e1a79a90790f335e9c831ad..33ce79ea144146ee7115fc7afda11f172d3b242f
+++ 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.
diff --cc configure.ac
Simple merge