Merge branch 'master' into xwidget

1 files changed, 10 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b02203dbe75..eecdad64785 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-01-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use gnustep-config if available
+        * configure.ac (--with-gnustep): Document this.
+        (NS_GNUSTEP_CONFIG): New variable, set if gnustep-config works.
+        If gnustep-config works, use 'gnustep-config --objc-flags' and
+        'gnustep-config --gui-libs' to compute GNUstep configuration
+        variables, instead of attempting to infer them individually.
+        Fixes: bug#19507
+
 2015-01-21  Ulrich Müller  <ulm@gentoo.org>
 
         * configure.ac (gamegroup): New AC_SUBST.