[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./configure.ac macros/docbook.m4
From: |
strk |
Subject: |
[Gnash-commit] gnash ./configure.ac macros/docbook.m4 |
Date: |
Fri, 06 Jan 2006 13:41:03 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: strk <address@hidden> 06/01/06 13:41:03
Modified files:
. : configure.ac
macros : docbook.m4
Log message:
Reworked AC_DOCBOOK_STYLES macro to include debian-specific location
of stylesheets. Fixed handling of --with-docdir: macro is always run,
--without-docdir disables it, --with-docdir=/tmp/ overrides it.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/docbook.m4.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.8 gnash/configure.ac:1.9
--- gnash/configure.ac:1.8 Tue Dec 27 16:19:27 2005
+++ gnash/configure.ac Fri Jan 6 13:41:02 2006
@@ -126,19 +126,15 @@
AM_CONDITIONAL(HTTP, test x$http = xtrue)
dnl Where are the Docbook stylesheets ?
-AC_ARG_WITH(docbook, [ --with-docbook specify the path to the Docbook
+AC_DOCBOOK_STYLES
+AC_ARG_WITH(docbook, [ --with-docbook=DIR specify the path to the Docbook
stylesheets],
[case "${withval}" in
- yes) docbook=yes ;;
- no) docbook=no ;;
- *) AC_MSG_ERROR([bad value ${withval} for with-docbook option]) ;;
+ yes) ;;
+ no) docbook_styles=;;
+ *) docbook_styles=${withval};;
esac])
-if test x$docbook = xyes; then
- DOCBOOK_STYLES="${withval}"
-else
- AC_DOCBOOK_STYLES
-fi
AC_PATH_FIREFOX
@@ -203,8 +199,8 @@
echo " Not building the web server support."
fi
-if test x"$docbook" = x"yes"; then
- echo " Docbook styles sheets in $DOCBOOK_STYLES"
+if test x"$docbook_styles" != x; then
+ echo " Docbook styles sheets in $docbook_styles"
fi
Index: gnash/macros/docbook.m4
diff -u gnash/macros/docbook.m4:1.2 gnash/macros/docbook.m4:1.3
--- gnash/macros/docbook.m4:1.2 Tue Dec 27 19:20:19 2005
+++ gnash/macros/docbook.m4 Fri Jan 6 13:41:02 2006
@@ -17,14 +17,12 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
AC_DEFUN([AC_DOCBOOK_STYLES], [
- dirlist="/usr /usr/local /opt /home/latest"
+ dirlist="/usr/share/sgml/docbook/xsl-stylesheets
/usr/local/share/sgml/docbook/xsl-stylesheets
/opt/share/sgml/docbook/xsl-stylesheets
/home/latest/share/sgml/docbook/xsl-stylesheets
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh"
for i in $dirlist; do
- for i in `ls -dr $i/share/sgml/docbook/xsl-stylesheets* 2>/dev/null ` ; do
- if test -f $i//html/docbook.xsl; then
+ if test -f $i/html/docbook.xsl; then
docbook_styles=`(cd $i; pwd)`
break
fi
- done
done
dnl FIXME: Make sure fop.sh exists too!
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./configure.ac macros/docbook.m4,
strk <=