Commit 7f957ac9 by Kai Tietz

re PR libstdc++/47145 (configure test for docbook-xsl-ns stylesheets uses hardcoded path)

2011-01-04  Kai Tietz  <kai.tietz@onevision.com>

        PR libstdc++/47145
        * configure.ac (AC_CHECK_FILE): Replaced by test -f.
        * configure: Regenerated.

Unbreaking cross-compiling ...

From-SVN: r168474
parent b6493d38
...@@ -59186,28 +59186,12 @@ $as_echo "no" >&6; } ...@@ -59186,28 +59186,12 @@ $as_echo "no" >&6; }
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION" >&5
$as_echo_n "checking for /usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION... " >&6; } glibcxx_stylesheets=no
if test "${ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_VERSION+set}" = set; then : if test -f /usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION; then
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
if test -r "/usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION"; then
ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_VERSION=yes
else
ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_VERSION=no
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_VERSION" >&5
$as_echo "$ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_VERSION" >&6; }
if test "x$ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_VERSION" = x""yes; then :
glibcxx_stylesheets=yes glibcxx_stylesheets=yes
else
glibcxx_stylesheets=no
fi fi
# Check for xml/html dependencies. # Check for xml/html dependencies.
if test $ac_cv_prog_DOXYGEN = "yes" && if test $ac_cv_prog_DOXYGEN = "yes" &&
test $ac_cv_prog_DOT = "yes" && test $ac_cv_prog_DOT = "yes" &&
...@@ -343,8 +343,11 @@ AC_CHECK_PROG([DOT], dot, yes, no) ...@@ -343,8 +343,11 @@ AC_CHECK_PROG([DOT], dot, yes, no)
# Check for docbook # Check for docbook
AC_CHECK_PROG([XSLTPROC], xsltproc, yes, no) AC_CHECK_PROG([XSLTPROC], xsltproc, yes, no)
AC_CHECK_PROG([XMLLINT], xmllint, yes, no) AC_CHECK_PROG([XMLLINT], xmllint, yes, no)
AC_CHECK_FILE([/usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION],
[glibcxx_stylesheets=yes], [glibcxx_stylesheets=no]) glibcxx_stylesheets=no
if test -f /usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION; then
glibcxx_stylesheets=yes
fi
# Check for xml/html dependencies. # Check for xml/html dependencies.
AM_CONDITIONAL(BUILD_XML, AM_CONDITIONAL(BUILD_XML,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment