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

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

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index bde823d7013d28ec8f50fa4f37cf2bd40ea5cde7..53c3af6a2d8cdd4e85ac6927a7d2e87fca7e142a 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -59186,28 +59186,12 @@ $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=no
+if test -f /usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION; then
   glibcxx_stylesheets=yes
-else
-  glibcxx_stylesheets=no
 fi
 
-
 # Check for xml/html dependencies.
  if test $ac_cv_prog_DOXYGEN = "yes" &&
               test $ac_cv_prog_DOT = "yes" &&

diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
index a70bbcf9e74b0b5445ad5c401f0ab0aa10cec1e5..94f63bb64329df52eb8b9c46a599e3a2c0ec4933 100644 (file)
--- a/libstdc++-v3/configure.ac
+++ b/libstdc++-v3/configure.ac
@@ -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,