hholzgra Mon Jan 7 17:07:23 2002 EDT
Modified files:
/phpdoc configure.in
Log:
no defaults if nothing found
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.106 phpdoc/configure.in:1.107
--- phpdoc/configure.in:1.106 Mon Jan 7 17:04:23 2002
+++ phpdoc/configure.in Mon Jan 7 17:07:23 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.106 2002/01/07 22:04:23 hholzgra Exp $
+dnl $Id: configure.in,v 1.107 2002/01/07 22:07:23 hholzgra Exp $
dnl autoconf initialisation
AC_INIT()
@@ -179,7 +179,7 @@
AC_ARG_WITH(dsssl,
[ --with-dsssl=[DIR] Look for DSSSL stylesheets in the specified directory],
[
- if test -d "$withval" ; then
+ if test -f "$withval/html/docbook.dsl" ; then
DOCBOOK_HTML=$withval/html/docbook.dsl
DOCBOOK_PRINT=$withval/print/docbook.dsl
AC_MSG_RESULT(in $withval)
@@ -216,6 +216,9 @@
done
cd ..
])
+if test -z "$DOCBOOK_HTML"; then
+ AC_MSG_RESULT(not found)
+fi
AC_SUBST(DOCBOOK_HTML)
AC_SUBST(DOCBOOK_PRINT)
@@ -229,11 +232,13 @@
AC_ARG_WITH(xsl,
[ --with-xsl=[URI] Look for XSL stylesheets at the specified URI],
[
+ if test -f "$dir/html/docbook.xsl"; then
DOCBOOKXSL_BIGHTML=$withval/html/docbook.xsl
DOCBOOKXSL_HTML=$withval/html/chunk.xsl
DOCBOOKXSL_HTMLHELP=$withval/htmlhelp/htmlhelp.xsl
DOCBOOKXSL_PRINT=$withval/fo/docbook.xsl
AC_MSG_RESULT(in $withval)
+ fi
],[
cd xsl
for dir in \
@@ -248,19 +253,14 @@
DOCBOOKXSL_HTML=$dir/html/chunk.xsl
DOCBOOKXSL_HTMLHELP=$dir/htmlhelp/htmlhelp.xsl
DOCBOOKXSL_PRINT=$dir/fo/docbook.xsl
- AC_MSG_RESULT(autodetected: $dir)
-
+ AC_MSG_RESULT(autodetected: $dir)
break
fi
done
cd ..
])
if test -z "$DOCBOOKXSL_BIGHTML"; then
- DOCBOOKXSL_BIGHTML=../phpdoc-tools/xsl/html/docbook.xsl
- DOCBOOKXSL_HTML=../phpdoc-tools/xsl/html/chunk.xsl
- DOCBOOKXSL_HTMLHELP=../phpdoc-tools/xsl/htmlhelp/htmlhelp.xsl
- DOCBOOKXSL_PRINT=../phpdoc-tools/xsl/fo/docbook.xsl
- AC_MSG_RESULT(not found, defaulting)
+ AC_MSG_RESULT(not found)
fi
AC_SUBST(DOCBOOKXSL_BIGHTML)
AC_SUBST(DOCBOOKXSL_HTML)
