Imported Upstream version 2.7.3

This commit is contained in:
Arnaud Quette 2015-04-30 15:53:36 +02:00
parent a356b56d11
commit fd413a3168
283 changed files with 14978 additions and 6511 deletions

12
m4/libtool.m4 vendored
View file

@ -1312,7 +1312,7 @@ ia64-*-hpux*)
rm -rf conftest*
;;
x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@ -1333,7 +1333,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
;;
esac
;;
ppc64-*linux*|powerpc64-*linux*)
powerpc64le-*)
LD="${LD-ld} -m elf32lppclinux"
;;
powerpc64-*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@ -1352,7 +1355,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
ppc*-*linux*|powerpc*-*linux*)
powerpcle-*)
LD="${LD-ld} -m elf64lppc"
;;
powerpc-*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)

View file

@ -35,6 +35,25 @@ if test -z "${nut_have_asciidoc_seen}"; then
AC_MSG_RESULT(${DBLATEX_VERSION} found)
fi
dnl FIXME check for xsltproc, xmlllint, etc for chunked HTML and man pages
AC_PATH_PROGS([XSLTPROC], [xsltproc])
if test -n "${XSLTPROC}"; then
AC_MSG_CHECKING([for xsltproc version])
XSLTPROC_VERSION="`${XSLTPROC} --version 2>/dev/null`"
dnl strip 'xsltproc version ' from version string
XSLTPROC_VERSION="${XSLTPROC_VERSION##* }"
AC_MSG_RESULT(${XSLTPROC_VERSION} found)
fi
AC_PATH_PROGS([XMLLINT], [xmllint])
if test -n "${XMLLINT}"; then
AC_MSG_CHECKING([for xmllint version])
XMLLINT_VERSION="`${XMLLINT} --version 2>/dev/null`"
dnl strip 'xmllint version ' from version string
XMLLINT_VERSION="${XMLLINT_VERSION##* }"
AC_MSG_RESULT(${XMLLINT_VERSION} found)
fi
AC_PATH_PROGS([SOURCE_HIGHLIGHT], [source-highlight])
fi
])