diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-05-02 19:18:11 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-05-02 19:18:11 -0400 |
| commit | b05e08a465dceee25798ac4fd745814cdb1b8b9b (patch) | |
| tree | 1cc7aeefe222af7a7c2e19075802635e3695452a /autogen.sh | |
| parent | cd626254b7031392ff12ba2806f0e68b0ccda8e3 (diff) | |
| download | emacs-b05e08a465dceee25798ac4fd745814cdb1b8b9b.tar.gz | |
Use pkg-config's pkg.m4
* 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.
(pkg_config_min): New variable.
* INSTALL.REPO: Mention pkg-config.
* etc/PROBLEMS: Mention a related issue that can occur with a local automake.
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/autogen.sh b/autogen.sh index 255a4d75ba6..84230b56016 100755 --- a/autogen.sh +++ b/autogen.sh @@ -32,7 +32,7 @@ ## Tools we need: ## Note that we respect the values of AUTOCONF etc, like autoreconf does. -progs="autoconf automake" +progs="autoconf automake pkg-config" ## Minimum versions we need: autoconf_min=`sed -n 's/^ *AC_PREREQ(\([0-9\.]*\)).*/\1/p' configure.ac` @@ -41,6 +41,7 @@ autoconf_min=`sed -n 's/^ *AC_PREREQ(\([0-9\.]*\)).*/\1/p' configure.ac` ## AM_INIT_AUTOMAKE call. automake_min=`sed -n 's/^ *AM_INIT_AUTOMAKE(\([0-9\.]*\)).*/\1/p' configure.ac` +pkg_config_min=`sed -n 's/^ *PKG_PROG_PKG_CONFIG(\([0-9\.]*\)).*/\1/p' configure.ac` ## $1 = program, eg "autoconf". ## Echo the version string, eg "2.59". |