aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-05-02 19:29:57 -0400
committerGlenn Morris2014-05-02 19:29:57 -0400
commitef9ea0a623c0b801b20ff54fa9318a74a84793f2 (patch)
tree0ad08b1569b6868a7d631f66318b2c8481426b2d
parentb05e08a465dceee25798ac4fd745814cdb1b8b9b (diff)
downloademacs-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--ChangeLog3
-rw-r--r--configure.ac9
-rw-r--r--etc/NEWS4
3 files changed, 7 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 91e51d681d2..dd63aa0812b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
12014-05-02 Glenn Morris <rgm@gnu.org> 12014-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:
305make GZIP_PROG= install]) 305make GZIP_PROG= install])
306 306
307AC_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])])
310if 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
314fi
315
316AC_ARG_WITH(gameuser,dnl 307AC_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])])
318test "X${with_gameuser}" != X && test "${with_gameuser}" != yes \ 309test "X${with_gameuser}" != X && test "${with_gameuser}" != yes \
diff --git a/etc/NEWS b/etc/NEWS
index 15c01607b1f..5a4410c685c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -34,6 +34,10 @@ should be able to work around the problem either by porting the Emacs
34undumping code to GCC under IRIX, or by configuring --with-wide-int, 34undumping code to GCC under IRIX, or by configuring --with-wide-int,
35or by sticking with Emacs 24.4. 35or by sticking with Emacs 24.4.
36 36
37---
38** The configure option `--with-pkg-config-prog' has been removed.
39Use 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