diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2012-11-11 21:01:01 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2012-11-11 21:01:01 +0000 |
| commit | 919bbe6e1e61e021120fc2dc952f920d13b61dc6 (patch) | |
| tree | 0f8febb4b268e250c322a8661aaa208ae7ff12a8 | |
| parent | 159520acf76cf7159e171370e06c7a6dd51d594d (diff) | |
| download | gcc-919bbe6e1e61e021120fc2dc952f920d13b61dc6.zip gcc-919bbe6e1e61e021120fc2dc952f920d13b61dc6.tar.gz gcc-919bbe6e1e61e021120fc2dc952f920d13b61dc6.tar.bz2 | |
acinclude.m4 (GLIBCXX_CONFIGURE_DOCBOOK): Also check for /usr/share/xml/docbook/stylesheet/nwalsh5/current.
* acinclude.m4 (GLIBCXX_CONFIGURE_DOCBOOK): Also check for
/usr/share/xml/docbook/stylesheet/nwalsh5/current.
* configure: Regenerate.
From-SVN: r193413
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 4 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cc14d1e..bd9ef59 100644 --- 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 10dac63..8c6f170 100644 --- 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 0c939ed..5a98ee7 100755 --- 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; } |