Compensate for Ubuntu having a brain dead uname -p

This commit is contained in:
John P. Hartmann
2014-10-04 12:42:28 +02:00
parent aeb87b397a
commit e1676f796a

32
autoconf/libtool.m4 vendored
View File

@@ -839,7 +839,7 @@ else
lt_cv_dlopen_self=yes
])
;;
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
@@ -1066,7 +1066,7 @@ if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
# <PATCH NAME="ISW20030916-1">
# <NEW>
# The following section is a PATCH to overcome the
# The following section is a PATCH to overcome the
# stripped import library issues under cygwin
case $host_os in
cygwin*)
@@ -1097,7 +1097,7 @@ fi
*)
AC_MSG_RESULT([no])
;;
esac
esac
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
@@ -2206,7 +2206,7 @@ irix5* | irix6* | nonstopux*)
# This must be Linux ELF.
linux*)
case $host_cpu in
alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh*)
alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64)
lt_cv_deplibs_check_method=pass_all ;;
*)
# glibc up to 2.1.1 does not perform some relocations on ARM
@@ -2594,7 +2594,7 @@ aix4*)
;;
10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
;;
;;
esac
fi
;;
@@ -2612,8 +2612,8 @@ aix4*)
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
fi
;;
esac
AC_MSG_RESULT([$enable_shared])
@@ -2931,7 +2931,7 @@ case $host_os in
;;
10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
;;
;;
esac
fi
;;
@@ -3869,7 +3869,7 @@ if test -f "$ltmain"; then
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
fi
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -3923,7 +3923,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
_LT_AC_TAGVAR(module_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_expsym_cmds, $1) | \
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
@@ -4686,7 +4686,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
;;
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
@@ -5046,7 +5046,7 @@ ifelse([$1],[CXX],[
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
@@ -5393,7 +5393,7 @@ EOF
;;
10.*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
;;
;;
esac
fi
;;
@@ -5421,9 +5421,9 @@ EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
fi
;;
dgux*)
@@ -5773,7 +5773,7 @@ x|xyes)
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest