diff options
author | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-11 21:01:01 +0000 |
---|---|---|
committer | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-11 21:01:01 +0000 |
commit | 1c47bb7a3c3448d350e9f00a6bfcede11250abad (patch) | |
tree | 0f8febb4b268e250c322a8661aaa208ae7ff12a8 /libstdc++-v3 | |
parent | 9c5813f5422e0040e16e766400ff95b0f2aea716 (diff) | |
download | ppe42-gcc-1c47bb7a3c3448d350e9f00a6bfcede11250abad.tar.gz ppe42-gcc-1c47bb7a3c3448d350e9f00a6bfcede11250abad.zip |
* acinclude.m4 (GLIBCXX_CONFIGURE_DOCBOOK): Also check for
/usr/share/xml/docbook/stylesheet/nwalsh5/current.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193413 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-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 cc14d1e66ba..bd9ef593776 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 10dac63dcf0..8c6f170a978 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 0c939ed90b8..5a98ee7bcde 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; } |