diff options
| author | Roger Pau Monne <roger.pau@entel.upc.edu> | 2012-03-01 16:59:33 +0000 |
|---|---|---|
| committer | Roger Pau Monne <roger.pau@entel.upc.edu> | 2012-03-01 16:59:33 +0000 |
| commit | 192c0b406d19b488fe83b055ced358f41de0ccc5 (patch) | |
| tree | 0ff1562ad72dda6ffff810be3da5d99ff185d0b3 /tools/m4 | |
| parent | 156ef03248cbb0cb0a0e8a5e318c1058c5cf674a (diff) | |
| download | xen-192c0b406d19b488fe83b055ced358f41de0ccc5.tar.gz xen-192c0b406d19b488fe83b055ced358f41de0ccc5.tar.bz2 xen-192c0b406d19b488fe83b055ced358f41de0ccc5.zip | |
build: autoconf: fix libdir detection
If user specifies a libdir it is used, if no libdir is specified
configure checks if $exec_prefix/lib64 is a directory and uses that,
if not lib is used.
$prefix is set by passing the command line option or by default when
calling AC_OUTPUT, but since AC_OUTPUT is called at the end, this is
not really helpful, so we have to set $exec_prefix manually to the
correct value, either $prefix if different than NONE or
$ac_default_prefix.
Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/m4')
| -rw-r--r-- | tools/m4/default_lib.m4 | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tools/m4/default_lib.m4 b/tools/m4/default_lib.m4 index b551619205..2e986836d8 100644 --- a/tools/m4/default_lib.m4 +++ b/tools/m4/default_lib.m4 @@ -1,8 +1,14 @@ AC_DEFUN([AX_DEFAULT_LIB], -[AS_IF([test -d "$prefix/lib64"], [ - LIB_PATH="lib64" -],[ - LIB_PATH="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)]) - |