diff options
| author | Paul Eggert | 2015-01-24 18:05:33 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-01-24 18:20:29 -0800 |
| commit | f6ef836521dfd07a0a33d5f1f384427f0c4023ce (patch) | |
| tree | 8e589f353774ac95d8fb9f1dfa4179c702e78759 /etc | |
| parent | bce27d884521832a62837b113f4e681974cdaccb (diff) | |
| download | emacs-f6ef836521dfd07a0a33d5f1f384427f0c4023ce.tar.gz emacs-f6ef836521dfd07a0a33d5f1f384427f0c4023ce.zip | |
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.
* etc/NEWS: Document this.
* src/emacs.c [NS_IMPL_GNUSTEP]: Don't include <GNUstepBase/GSConfig.h>.
It doesn't appear to be needed, and the inclusion breaks on
Ubuntu 14.10 when 'configure' uses 'gnustep-config'.
Fixes: bug#19507
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ChangeLog | 5 | ||||
| -rw-r--r-- | etc/NEWS | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 47f61f4d7fd..55b835c0cf9 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2015-01-25 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Use gnustep-config if available | ||
| 4 | * NEWS: Document this. | ||
| 5 | |||
| 1 | 2015-01-22 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2015-01-22 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Don't downcase system diagnostics' first letters | 8 | Don't downcase system diagnostics' first letters |
| @@ -36,6 +36,9 @@ should be able to work around the problem either by porting the Emacs | |||
| 36 | undumping code to GCC under IRIX, or by configuring --with-wide-int, | 36 | undumping code to GCC under IRIX, or by configuring --with-wide-int, |
| 37 | or by sticking with Emacs 24.4. | 37 | or by sticking with Emacs 24.4. |
| 38 | 38 | ||
| 39 | ** 'configure' now prefers gnustep-config when configuring GNUstep. | ||
| 40 | If gnustep-config is not available, the old heuristics are used. | ||
| 41 | |||
| 39 | --- | 42 | --- |
| 40 | ** The configure option `--with-pkg-config-prog' has been removed. | 43 | ** The configure option `--with-pkg-config-prog' has been removed. |
| 41 | Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to. | 44 | Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to. |