From ef9ea0a623c0b801b20ff54fa9318a74a84793f2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 2 May 2014 19:29:57 -0400 Subject: [PATCH] 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. --- ChangeLog | 3 +++ configure.ac | 9 --------- etc/NEWS | 4 ++++ 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 @@ 2014-05-02 Glenn Morris + * configure.ac (--with-pkg-config-prog): Remove. + Use the PKG_CONFIG environment variable instead if you need it. + * configure.ac: Use pkg-config's pkg.m4, rather than reinventing it. Add explicit AC_SUBST's where needed. * 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], [don't compress some files (.el, .info, etc.) when installing. Equivalent to: make GZIP_PROG= install]) -AC_ARG_WITH([pkg-config-prog],dnl -[AS_HELP_STRING([--with-pkg-config-prog=FILENAME], - [file name of pkg-config for finding GTK and librsvg])]) -if test "X${with_pkg_config_prog}" != X; then - if test "${with_pkg_config_prog}" != yes; then - PKG_CONFIG="${with_pkg_config_prog}" - fi -fi - AC_ARG_WITH(gameuser,dnl [AS_HELP_STRING([--with-gameuser=USER],[user for shared game score files])]) test "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 undumping code to GCC under IRIX, or by configuring --with-wide-int, or by sticking with Emacs 24.4. +--- +** The configure option `--with-pkg-config-prog' has been removed. +Use the PKG_CONFIG environment variable instead if you need to. + * Startup Changes in Emacs 24.5 -- 2.39.5