Don't require pkg-config when building from repository.

* INSTALL: Prefer './configure FOO=BAR' to 'FOO=BAR ./configure'.
* INSTALL.REPO: pkg-config is no longer required to build from
the repository.
* autogen.sh: Don't check for pkg-config.
(progs): Remove pkg-config.
(pkg_config_min, AUTORECONF_ENV, env_space, ACLOCAL_PATH):
Remove.  All uses removed.
* m4/pkg.m4: New file, built by admin/merge-pkg-config.
* configure.ac: Remove unnecessary m4_pattern_forbid of ^PKG_ and
an AC_ARG_VAR of PKG_CONFIG_PATH.  pkg.m4 does that for us.
(EMACS_CHECK_MODULES): Remove workaround for old pkg-config bug,
as we use pkg.m4 from a newer pkg-config.
* admin/merge-pkg-config: New script.
* admin/notes/copyright: Update for m4/*.m4, in particular m4/pkg.m4.
* etc/NEWS: Prefer './configure FOO=BAR' to 'FOO=BAR ./configure'.
* etc/PROBLEMS (Build-time-problems): Remove pkg-config problem
that is no longer an issue.
* nt/INSTALL: Remove no-longer-needed notes about pkg-config.

2 files changed, 10 insertions, 16 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 16d3e5f3972..fc1b0a09102 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Don't require pkg-config when building from repository.
+	* INSTALL: Remove no-longer-needed notes about pkg-config.
+
 2014-05-05  Eli Zaretskii  <eliz@gnu.org>
 
 	* INSTALL: Update to the effect that pkg-config is now required
diff --git a/nt/INSTALL b/nt/INSTALL
index 0d54f27dfff..949a4e452cf 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -115,11 +115,6 @@ Windows 9X as well).
   MSYS Texinfo, after installing it as part of msys-base, invoke the
   command "mingw-get remove msys-texinfo".)
 
-  In addition, building Emacs from the development repository requires
-  pkg-config to be installed.  As the MinGW project does not offer it,
-  you will have to install it from elsewhere; see below (search for
-  "pkg-config").
-
   At this point, you should be ready to configure and build Emacs in
   its basic configuration.  Skip to the "Generating the configure
   script" section for the build instructions.  If you want to build it
@@ -179,9 +174,7 @@ Windows 9X as well).
      Available from http://sourceforge.net/projects/ezwinports/files/.
 
    . pkg-config (invoked by the configure script to look for optional
-     packages; _required_ for building from the development
-     repository, as some components of pkg-config are needed to run
-     the autoconf and aclocal scripts)
+     packages)
 
      Available from http://www.gtk.org/download/win32.php
 
@@ -243,10 +236,10 @@ Windows 9X as well).
   from which you unpack all of the MSYS packages.
 
   After installing Automake and Autoconf, make sure any of the *.m4
-  files you might have in your MinGW installation (e.g., pkg.m4 that
-  comes with pkg-config) also exist in the MSYS installation tree, in
-  the share/aclocal directory.  Those *.m4 files which exist in the
-  MinGW tree, but not in the MSYS tree should be copied there.
+  files you might have in your MinGW installation also exist in the
+  MSYS installation tree, in the share/aclocal directory.  Those *.m4
+  files which exist in the MinGW tree, but not in the MSYS tree should
+  be copied there.
 
   If/when you are confident in your MinGW/MSYS installation, and want
   to speed up the builds, we recommend installing a pre-release
@@ -311,10 +304,6 @@ Windows 9X as well).
      ok
      Checking for automake (need at least version 1.11)...
      ok
-     Checking for pkg-config (need at least version 0.9.0)...
-     ok
-     Checking for pkg.m4...
-     ok
      Your system has the required tools, running autoreconf...
      You can now run `./configure'.