diff options
author | Paul Eggert <[email protected]> | 2014-05-16 08:49:13 -0700 |
---|---|---|
committer | Paul Eggert <[email protected]> | 2014-05-16 08:49:13 -0700 |
commit | c56327b55d2e75fb0246c9a858e46dd5670699d4 (patch) | |
tree | 0025149767d9633d3cfe20c8ff523bd7a0b22b84 /autogen.sh | |
parent | 1e217552d247b8b64cda5ac93805f039071204fc (diff) |
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.
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 96 |
1 files changed, 3 insertions, 93 deletions
diff --git a/autogen.sh b/autogen.sh index 32f86ab820..48e6d19c69 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 pkg-config" +progs="autoconf automake" ## Minimum versions we need: autoconf_min=`sed -n 's/^ *AC_PREREQ(\([0-9\.]*\)).*/\1/p' configure.ac` @@ -41,7 +41,6 @@ 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". @@ -205,97 +204,8 @@ EOF exit 1 fi -# If automake is installed in a nonstandard location, find the standard -# location if possible and append it to ACLOCAL_PATH. That way, it will -# find the pkg.m4 that is installed in the standard location. -echo "Checking for pkg.m4..." -AUTORECONF_ENV= -env_space= -ac_dir=`aclocal --print-ac-dir` || { - cat <<EOF -There was a problem running 'aclocal --print-ac-dir'. -The aclocal program is part of automake. -Please check your automake installation. -EOF - - exit 1 -} - -test -n "$ac_dir" && test -r "$ac_dir/pkg.m4" || { - - # Maybe ACLOCAL_PATH is already set-up. - if test -n "$ACLOCAL_PATH"; then - oIFS=$IFS - IFS=: - for dir in $ACLOCAL_PATH; do - if test -r "$dir/pkg.m4"; then - AUTORECONF_ENV="ACLOCAL_PATH='$ACLOCAL_PATH'" - env_space=' ' - break - fi - done - IFS=$oIFS - fi - - if test -z "$AUTORECONF_ENV"; then - oIFS=$IFS - IFS=: - before_first_aclocal=true - for dir in $PATH; do - if test -x "$dir/aclocal"; then - if $before_first_aclocal; then - before_first_aclocal=false - elif ac_dir=`"$dir/aclocal" --print-ac-dir` && test -r "$ac_dir/pkg.m4" - then - case $ACLOCAL_PATH in - '') ACLOCAL_PATH=$ac_dir;; - ?*) ACLOCAL_PATH=$ACLOCAL_PATH:$ac_dir;; - esac - export ACLOCAL_PATH - AUTORECONF_ENV="ACLOCAL_PATH='$ACLOCAL_PATH'" - env_space=' ' - break - fi - fi - done - IFS=$oIFS - fi - - ## OK, maybe pkg-config is in a weird place (eg on hydra). - if test -z "$AUTORECONF_ENV"; then - oIFS=$IFS - IFS=: - for dir in $PATH; do - if test -x "$dir/pkg-config"; then - ac_dir=`echo "$dir" | sed 's|bin$|share/aclocal|'` - if test -r "$ac_dir/pkg.m4"; then - case $ACLOCAL_PATH in - '') ACLOCAL_PATH=$ac_dir;; - ?*) ACLOCAL_PATH=$ACLOCAL_PATH:$ac_dir;; - esac - export ACLOCAL_PATH - AUTORECONF_ENV="ACLOCAL_PATH='$ACLOCAL_PATH'" - env_space=' ' - break - fi - fi - done - IFS=$oIFS - fi - - if test -z "$AUTORECONF_ENV"; then - cat <<EOF -The version of aclocal that you are using cannot find the pkg.m4 file that -pkg-config provides. If it is installed in some unusual directory /FOO/BAR, -set ACLOCAL_PATH='/FOO/BAR' in the environment and run this script again. -EOF - exit 1 - fi -} -echo ok - echo 'Your system has the required tools.' -echo "Running \"$AUTORECONF_ENV${env_space}autoreconf -fi -I m4\" ..." +echo "Running 'autoreconf -fi -I m4' ..." ## Let autoreconf figure out what, if anything, needs doing. @@ -306,7 +216,7 @@ autoreconf -fi -I m4 || exit $? ## cause 'make' to needlessly run 'autoheader'. echo timestamp > src/stamp-h.in || exit -echo "You can now run \"./configure$env_space$AUTORECONF_ENV\"." +echo "You can now run './configure'." exit 0 |