mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
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>
This commit is contained in:
Matt Wilson committed
1 parent
cd9ab8f94f
commit
a80e6fb671
4 files changed
+4
-48
No files matched your search
+4
-2
@@ -1,7 +1,9 @@
|
||||
# Prefix and install folder
|
||||
PREFIX := @prefix@
|
||||
prefix := @prefix@
|
||||
PREFIX := $(prefix)
|
||||
exec_prefix := @exec_prefix@
|
||||
LIBDIR := @libdir@
|
||||
libdir := @libdir@
|
||||
LIBDIR := $(libdir)
|
||||
|
||||
# A debug build of tools?
|
||||
debug := @debug@
|
||||
|
||||
Vendored
-28
@@ -606,7 +606,6 @@ libgcrypt
|
||||
libext2fs
|
||||
system_aio
|
||||
zlib
|
||||
LIB_PATH
|
||||
glib_LIBS
|
||||
glib_CFLAGS
|
||||
PKG_CONFIG_LIBDIR
|
||||
@@ -2308,8 +2307,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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 :
|
||||
|
||||
@@ -28,7 +28,6 @@ m4_include([m4/path_or_fail.m4])
|
||||
m4_include([m4/python_version.m4])
|
||||
m4_include([m4/python_devel.m4])
|
||||
m4_include([m4/ocaml.m4])
|
||||
m4_include([m4/default_lib.m4])
|
||||
m4_include([m4/set_cflags_ldflags.m4])
|
||||
m4_include([m4/uuid.m4])
|
||||
m4_include([m4/pkg.m4])
|
||||
@@ -121,9 +120,6 @@ esac
|
||||
AX_CHECK_CURSES
|
||||
PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12])
|
||||
|
||||
# Check library path
|
||||
AX_DEFAULT_LIB
|
||||
|
||||
# Checks for libraries.
|
||||
AC_CHECK_HEADER([bzlib.h], [
|
||||
AC_CHECK_LIB([bz2], [BZ2_bzDecompressInit], [zlib="$zlib -DHAVE_BZLIB -lbz2"])
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
AC_DEFUN([AX_DEFAULT_LIB],
|
||||
[AS_IF([test "\${exec_prefix}/lib" = "$libdir"],
|
||||
[AS_IF([test "$exec_prefix" = "NONE" && test "$prefix" != "NONE"],
|
||||
[exec_prefix=$prefix])
|
||||
AS_IF([test "$exec_prefix" = "NONE"], [exec_prefix=$ac_default_prefix])
|
||||
AS_IF([test -d "${exec_prefix}/lib64"], [
|
||||
LIB_PATH="lib64"
|
||||
],[
|
||||
LIB_PATH="lib"
|
||||
])
|
||||
], [
|
||||
LIB_PATH="${libdir:`expr length "$exec_prefix" + 1`}"
|
||||
])
|
||||
AC_SUBST(LIB_PATH)])
|
||||