diff options
| author | Werner Koch <[email protected]> | 2013-02-26 15:14:52 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-02-26 15:14:52 +0000 |
| commit | fdcd5736e610cd64e47da73dcafe8bc4a6a67666 (patch) | |
| tree | 4d523b11e4ea00cf85388a273a056ad90adf67b1 /autogen.sh | |
| parent | Remove included gitlog-to-changelog. (diff) | |
| download | gpgme-fdcd5736e610cd64e47da73dcafe8bc4a6a67666.tar.gz gpgme-fdcd5736e610cd64e47da73dcafe8bc4a6a67666.zip | |
Update helper scripts.
* configure.ac: Use AC_CONFIG_AUX_DIR. Remove args from
AM_INIT_AUTOMAKE. Replace AM_CONFIG_HEADER by AC_CONFIG_HEADER.
* compile, config.guess, config.sub, depcomp, install-sh, ltmain.sh
* mkinstalldirs, texinfo.texi: Move to build-aux/ and update from
gnulib (c042abf).
* build-aux/mdate-sh, build-aux/missing: Install via automake -a -c.
Update autogen.sh for changed config dir.
* autogen.sh: Adjust for scripts dir change. Update W32 toolprefix
list.
Diffstat (limited to '')
| -rwxr-xr-x | autogen.sh | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -87,11 +87,11 @@ if [ "$myhost" = "w32" ]; then tmp=`dirname $0` tsdir=`cd "$tmp"; pwd` shift - if [ ! -f $tsdir/config.guess ]; then - echo "$tsdir/config.guess not found" >&2 + if [ ! -f $tsdir/build-aux/config.guess ]; then + echo "$tsdir/build-aux/config.guess not found" >&2 exit 1 fi - build=`$tsdir/config.guess` + build=`$tsdir/build-aux/config.guess` case $myhostsub in ce) @@ -102,11 +102,12 @@ if [ "$myhost" = "w32" ]; then 64) w32root="$w64root" [ -z "$w32root" ] && w32root="$HOME/w64root" - toolprefixes="i686-w64-mingw32 amd64-mingw32msvc" + toolprefixes="$amd64_toolprefixes amd64-mingw32msvc" ;; *) [ -z "$w32root" ] && w32root="$HOME/w32root" - toolprefixes="i686-w64-mingw32 i586-mingw32msvc i386-mingw32msvc" + toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc" + toolprefixes="$toolprefixes i386-mingw32msvc mingw32" ;; esac echo "Using $w32root as standard install directory" >&2 @@ -152,11 +153,11 @@ if [ "$myhost" = "amd64" ]; then tmp=`dirname $0` tsdir=`cd "$tmp"; pwd` shift - if [ ! -f $tsdir/config.guess ]; then - echo "$tsdir/config.guess not found" >&2 + if [ ! -f $tsdir/build-aux/config.guess ]; then + echo "$tsdir/build-aux/config.guess not found" >&2 exit 1 fi - build=`$tsdir/config.guess` + build=`$tsdir/build-aux/config.guess` [ -z "$amd64root" ] && amd64root="$HOME/amd64root" echo "Using $amd64root as standard install directory" >&2 |