acinclude.m4 (GLIBCXX_CONFIGURE_DOCBOOK): Also check for /usr/share/xml/docbook/style...

* acinclude.m4 (GLIBCXX_CONFIGURE_DOCBOOK): Also check for
/usr/share/xml/docbook/stylesheet/nwalsh5/current.
* configure: Regenerate.

From-SVN: r193413

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cc14d1e66ba86a84f670e517c7f322a1b612ef05..bd9ef5937768e566c990bef9518876ea5b443f9f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * acinclude.m4 (GLIBCXX_CONFIGURE_DOCBOOK): Also check for
+       /usr/share/xml/docbook/stylesheet/nwalsh5/current.
+       * configure: Regenerate.
+
 2012-11-11  Gerald Pfeifer  <gerald@pfeifer.com>
 
        * doc/xml/manual/policy_data_structures.xml: Update reference

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 10dac63dcf093c32db52deecebb4ac77d36e7306..8c6f170a9785cfbbff9ec643b23a7e9c9ace55b4 100644 (file)
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -686,6 +686,10 @@ if test x"$glibcxx_stylesheets" = x"yes"; then
     glibcxx_local_stylesheets=yes
     XSL_STYLE_DIR=/usr/share/xml/docbook/stylesheet/docbook-xsl-ns
   fi
+  if test -d /usr/share/xml/docbook/stylesheet/nwalsh5/current; then
+    glibcxx_local_stylesheets=yes
+    XSL_STYLE_DIR=/usr/share/xml/docbook/stylesheet/nwalsh5/current
+  fi
 fi
 AC_MSG_RESULT($glibcxx_local_stylesheets)
 

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 0c939ed90b8c715996cdeeb814157dd1b87ef3af..5a98ee7bcded4f22d605a36541139f64c7ceb1c0 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -71491,6 +71491,10 @@ if test x"$glibcxx_stylesheets" = x"yes"; then
     glibcxx_local_stylesheets=yes
     XSL_STYLE_DIR=/usr/share/xml/docbook/stylesheet/docbook-xsl-ns
   fi
+  if test -d /usr/share/xml/docbook/stylesheet/nwalsh5/current; then
+    glibcxx_local_stylesheets=yes
+    XSL_STYLE_DIR=/usr/share/xml/docbook/stylesheet/nwalsh5/current
+  fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_local_stylesheets" >&5
 $as_echo "$glibcxx_local_stylesheets" >&6; }