diff options
| author | Glenn Morris | 2014-05-02 19:29:57 -0400 |
|---|---|---|
| committer | Glenn Morris | 2014-05-02 19:29:57 -0400 |
| commit | ef9ea0a623c0b801b20ff54fa9318a74a84793f2 (patch) | |
| tree | 0ad08b1569b6868a7d631f66318b2c8481426b2d | |
| parent | b05e08a465dceee25798ac4fd745814cdb1b8b9b (diff) | |
| download | emacs-ef9ea0a623c0b801b20ff54fa9318a74a84793f2.tar.gz emacs-ef9ea0a623c0b801b20ff54fa9318a74a84793f2.zip | |
Remove the --with-pkg-config-prog configure option
* configure.ac (--with-pkg-config-prog): Remove.
Use the PKG_CONFIG environment variable instead if you need it.
* etc/NEWS: Mention this.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | etc/NEWS | 4 |
3 files changed, 7 insertions, 9 deletions
| @@ -1,5 +1,8 @@ | |||
| 1 | 2014-05-02 Glenn Morris <rgm@gnu.org> | 1 | 2014-05-02 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * configure.ac (--with-pkg-config-prog): Remove. | ||
| 4 | Use the PKG_CONFIG environment variable instead if you need it. | ||
| 5 | |||
| 3 | * configure.ac: Use pkg-config's pkg.m4, rather than reinventing it. | 6 | * configure.ac: Use pkg-config's pkg.m4, rather than reinventing it. |
| 4 | Add explicit AC_SUBST's where needed. | 7 | Add explicit AC_SUBST's where needed. |
| 5 | * autogen.sh (progs): Add pkg-config. | 8 | * autogen.sh (progs): Add pkg-config. |
diff --git a/configure.ac b/configure.ac index 27312cac3ab..81b8537f0bd 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -304,15 +304,6 @@ OPTION_DEFAULT_ON([compress-install], | |||
| 304 | [don't compress some files (.el, .info, etc.) when installing. Equivalent to: | 304 | [don't compress some files (.el, .info, etc.) when installing. Equivalent to: |
| 305 | make GZIP_PROG= install]) | 305 | make GZIP_PROG= install]) |
| 306 | 306 | ||
| 307 | AC_ARG_WITH([pkg-config-prog],dnl | ||
| 308 | [AS_HELP_STRING([--with-pkg-config-prog=FILENAME], | ||
| 309 | [file name of pkg-config for finding GTK and librsvg])]) | ||
| 310 | if test "X${with_pkg_config_prog}" != X; then | ||
| 311 | if test "${with_pkg_config_prog}" != yes; then | ||
| 312 | PKG_CONFIG="${with_pkg_config_prog}" | ||
| 313 | fi | ||
| 314 | fi | ||
| 315 | |||
| 316 | AC_ARG_WITH(gameuser,dnl | 307 | AC_ARG_WITH(gameuser,dnl |
| 317 | [AS_HELP_STRING([--with-gameuser=USER],[user for shared game score files])]) | 308 | [AS_HELP_STRING([--with-gameuser=USER],[user for shared game score files])]) |
| 318 | test "X${with_gameuser}" != X && test "${with_gameuser}" != yes \ | 309 | test "X${with_gameuser}" != X && test "${with_gameuser}" != yes \ |
| @@ -34,6 +34,10 @@ should be able to work around the problem either by porting the Emacs | |||
| 34 | undumping code to GCC under IRIX, or by configuring --with-wide-int, | 34 | undumping code to GCC under IRIX, or by configuring --with-wide-int, |
| 35 | or by sticking with Emacs 24.4. | 35 | or by sticking with Emacs 24.4. |
| 36 | 36 | ||
| 37 | --- | ||
| 38 | ** The configure option `--with-pkg-config-prog' has been removed. | ||
| 39 | Use the PKG_CONFIG environment variable instead if you need to. | ||
| 40 | |||
| 37 | 41 | ||
| 38 | * Startup Changes in Emacs 24.5 | 42 | * Startup Changes in Emacs 24.5 |
| 39 | 43 | ||