diff options
author | Matt Wilson <msw@amazon.com> | 2012-08-31 10:42:09 +0100 |
---|---|---|
committer | Matt Wilson <msw@amazon.com> | 2012-08-31 10:42:09 +0100 |
commit | a80e6fb6716fcd879b5dbd501b72c87accbfdd37 (patch) | |
tree | 0d06d69a9e42586db2f4528fa915cbf07913b625 /tools/configure | |
parent | cd9ab8f94f69a3c7040821b7bbd27bae986b5a0b (diff) | |
download | xen-a80e6fb6716fcd879b5dbd501b72c87accbfdd37.tar.gz xen-a80e6fb6716fcd879b5dbd501b72c87accbfdd37.tar.bz2 xen-a80e6fb6716fcd879b5dbd501b72c87accbfdd37.zip |
tools: remove vestigial default_lib.m4 macros and adjust substitutions
LIB_PATH is no longer used, so the AX_DEFAULT_LIB macro is no longer
needed. Additionally lower case make variables are now used as
autoconf substitutions, which allows for more correct overrides at
build time.
I've checked the file layout in dist/install from the build made
before this change versus after with ./configure values of:
1) ./configure (no flags provided)
2) ./configure --libdir=/usr/lib/x86_64-linux-gnu (Debian style)
3) ./configure --libdir='${exec_prefix}/lib' (late variable expansion)
Signed-off-by: Matt Wilson <msw@amazon.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
[ ijc - reran autogen.sh ]
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/configure')
-rwxr-xr-x | tools/configure | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/tools/configure b/tools/configure index aa1d96f90c..6107d88d12 100755 --- a/tools/configure +++ b/tools/configure @@ -606,7 +606,6 @@ libgcrypt libext2fs system_aio zlib -LIB_PATH glib_LIBS glib_CFLAGS PKG_CONFIG_LIBDIR @@ -2311,8 +2310,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) # @@ -6125,31 +6122,6 @@ $as_echo "yes" >&6; } fi -# Check library path -if test "\${exec_prefix}/lib" = "$libdir"; then : - if test "$exec_prefix" = "NONE" && test "$prefix" != "NONE"; then : - exec_prefix=$prefix -fi - if test "$exec_prefix" = "NONE"; then : - exec_prefix=$ac_default_prefix -fi - if test -d "${exec_prefix}/lib64"; then : - - LIB_PATH="lib64" - -else - - LIB_PATH="lib" - -fi - -else - - LIB_PATH="${libdir:`expr length "$exec_prefix" + 1`}" - -fi - - # Checks for libraries. ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default" if test "x$ac_cv_header_bzlib_h" = x""yes; then : |