X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz.m4;h=740cf688245312e5005a74d4223cd46f7eb70055;hb=a746c25073f57d3094cd1834e8dcc9cf19f82f91;hp=72b93ed7700b87de3bf817956cc72f9f91ceffaf;hpb=f3e04c274caedf95069ae77b369f71ebf9de00d4;p=yazpp-moved-to-github.git

diff --git a/yaz.m4 b/yaz.m4
index 72b93ed..740cf68 100644
--- a/yaz.m4
+++ b/yaz.m4
@@ -1,4 +1,4 @@
-## $Id: yaz.m4,v 1.8 2004-08-16 12:40:14 adam Exp $
+## $Id: yaz.m4,v 1.11 2004-09-11 20:53:10 adam Exp $
 ## 
 # Use this m4 function for autoconf if you use YAZ in your own
 # configure script.
@@ -7,10 +7,10 @@ dnl ----- Setup Docbook documentation for YAZ
 AC_DEFUN([YAZ_DOC],
 [
 AC_SUBST(DTD_DIR)	
-AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        use docbookx.dtd in DIR],
+AC_ARG_WITH(docbook-dtd, [  --with-docbook-dtd[=DIR]  use docbookx.dtd in DIR],
 [
 	if test -f "$withval/docbookx.dtd"; then
-		DTD_DIR=$withva	l
+		DTD_DIR=$withval
 	fi
 ],[
 	AC_MSG_CHECKING(for docbookx.dtd)
@@ -32,7 +32,7 @@ AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        use docbookx.dtd in DIR],
 	fi
 ])
 AC_SUBST(DSSSL_DIR)
-AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      use Docbook DSSSL in DIR/{html,print}/docbook.dsl],
+AC_ARG_WITH(docbook-dsssl,[  --with-docbook-dsssl[=DIR] use Docbook DSSSL in DIR/{html,print}/docbook.dsl],
 [
 	if test -f "$withval/html/docbook.dsl"; then
 		DSSSL_DIR=$withval
@@ -55,7 +55,7 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      use Docbook DSSSL in DIR/{html,prin
 	fi
 ])
 AC_SUBST(XSL_DIR)
-AC_ARG_WITH(xsl,[  --with-xsl[=DIR]        use Docbook XSL in DIR/{htmlhelp,xhtml}],
+AC_ARG_WITH(docbook-xsl,[  --with-docbook-xsl[=DIR]  use Docbook XSL in DIR/{htmlhelp,xhtml}],
 [
 	if test -f "$withval/htmlhelp/htmlhelp.xsl"; then
 		XSL_DIR=$withval
@@ -85,7 +85,7 @@ AC_DEFUN([YAZ_INIT],
 	AC_SUBST(YAZVERSION)
 	yazconfig=NONE
 	yazpath=NONE
-	AC_ARG_WITH(yazconfig, [  --with-yazconfig=DIR    yaz-config in DIR (example /home/yaz-1.7)], [yazpath=$withval])
+	AC_ARG_WITH(yaz, [  --with-yaz=DIR          use yaz-config in DIR (example /home/yaz-1.7)], [yazpath=$withval])
 	if test "x$yazpath" != "xNONE"; then
 		yazconfig=$yazpath/yaz-config
 	else