OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Kai Tietz 2011-01-04 18:59:39 +01:00
parent b6493d3890
commit 7f957ac94c
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libstdc++-v3/configure vendored
View File

@ -59186,27 +59186,11 @@ $as_echo "no" >&6; }
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; }
if test "${ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_VERSION+set}" = set; 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
else
glibcxx_stylesheets=no
fi
glibcxx_stylesheets=no
if test -f /usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION; then
glibcxx_stylesheets=yes
fi
# Check for xml/html dependencies.
if test $ac_cv_prog_DOXYGEN = "yes" &&

7
libstdc++-v3/configure.ac
View File

@ -343,8 +343,11 @@ AC_CHECK_PROG([DOT], dot, yes, no)
# Check for docbook
AC_CHECK_PROG([XSLTPROC], xsltproc, 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.
AM_CONDITIONAL(BUILD_XML,