From c56327b55d2e75fb0246c9a858e46dd5670699d4 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 16 May 2014 08:49:13 -0700 Subject: 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. --- INSTALL | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index 3502631cbc..473dc08a4a 100644 --- a/INSTALL +++ b/INSTALL @@ -262,9 +262,9 @@ with the mouse. You can get fancy 3D-style scroll bars, even without Gtk or Motif, if you have the Xaw3d library installed (see "Image support libraries" above for Xaw3d availability). -You can tell configure where to search for GTK by specifying -`--with-pkg-config-prog=PATH' where PATH is the pathname to -pkg-config. Note that GTK version 2.6 or newer is required for Emacs. +You can tell configure where to search for GTK by giving it the +argument PKG_CONFIG='/full/name/of/pkg-config'. GTK version 2.6 or +newer is required for Emacs. Emacs will autolaunch a D-Bus session bus, when the environment variable DISPLAY is set, but no session bus is running. This might be @@ -408,10 +408,11 @@ compiler. By default, gcc is used if available. Here's an example of a `configure' invocation, assuming a Bourne-like shell such as Bash, which uses these variables: - CPPFLAGS='-I/foo/myinclude' LDFLAGS='-L/bar/mylib' \ - CFLAGS='-O3' LIBS='-lfoo -lbar' ./configure + ./configure \ + CPPFLAGS='-I/foo/myinclude' LDFLAGS='-L/bar/mylib' \ + CFLAGS='-O3' LIBS='-lfoo -lbar' -(this is all one long line). This tells `configure' to instruct the +(this is all one shell command). This tells `configure' to instruct the preprocessor to look in the `/foo/myinclude' directory for header files (in addition to the standard directories), instruct the linker to look in `/bar/mylib' for libraries, pass the -O3 optimization @@ -421,12 +422,11 @@ libraries in addition to the standard ones. For some libraries, like Gtk+, fontconfig and ALSA, `configure' uses pkg-config to find where those libraries are installed. If you want pkg-config to look in special directories, you have to set -the environment variable PKG_CONFIG_PATH to point to the directories -where the .pc-files for those libraries are. -For example: +PKG_CONFIG_PATH to point to the directories where the .pc-files for +those libraries are. For example: - PKG_CONFIG_PATH='/usr/local/alsa/lib/pkgconfig:/opt/gtk+-2.8/lib/pkgconfig' \ - ./configure + ./configure \ + PKG_CONFIG_PATH='/usr/local/alsa/lib/pkgconfig:/opt/gtk+-2.8/lib/pkgconfig' The work of `configure' can be done by editing various files in the distribution, but using `configure' is easier. See the section called -- cgit v1.2.3