From a11e628cb73fff31137b4faa3e653390ff66650f Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 9 Sep 2004 09:50:15 +0000 Subject: [PATCH] Update to new yaz.m4 (--with-yaz-config change) --- debian/rules | 2 +- yaz.m4 | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 92 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index 093e708..77c4c66 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ # This is the debhelper compatability version to use. export DH_COMPAT=2 -CONFIG_FLAGS=--with-tclconfig=/usr/lib/tcl8.3 --with-yazconfig=/usr/bin --prefix=/usr +CONFIG_FLAGS=--with-tclconfig=/usr/lib/tcl8.3 --with-yaz-config=/usr/bin --prefix=/usr # Enable parallel builds if CONCURRENCY_LEVEL is set ifdef CONCURRENCY_LEVEL diff --git a/yaz.m4 b/yaz.m4 index 83d866b..9112d9a 100644 --- a/yaz.m4 +++ b/yaz.m4 @@ -1,8 +1,81 @@ -## $Id: yaz.m4,v 1.5 2003-11-28 23:07:10 adam Exp $ +## $Id: yaz.m4,v 1.6 2004-09-09 09:50:15 adam Exp $ ## -# Use this m4 funciton for autoconf if you use YAZ in your own +# Use this m4 function for autoconf if you use YAZ in your own # configure script. -# YAZ_INIT + +dnl ----- Setup Docbook documentation for YAZ +AC_DEFUN([YAZ_DOC], +[ +AC_SUBST(DTD_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 + fi +],[ + AC_MSG_CHECKING(for docbookx.dtd) + DTD_DIR="" + for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \ + /usr/share/sgml/docbook/xml-dtd-4.1.2* \ + /usr/share/sgml/docbook/xml-dtd-4.1 \ + /usr/share/sgml/docbook/dtd/xml/4.0 \ + /usr/lib/sgml/dtd/docbook-xml + do + if test -f $d/docbookx.dtd; then + AC_MSG_RESULT($d) + DTD_DIR=$d + break + fi + done + if test -z "$DTD_DIR"; then + AC_MSG_RESULT(Not found) + fi +]) +AC_SUBST(DSSSL_DIR) +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 + fi +],[ + AC_MSG_CHECKING(for docbook.dsl) + DSSSL_DIR="" + for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \ + /usr/share/sgml/docbook/dsssl-stylesheets-1.* \ + /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh + do + if test -f $d/html/docbook.dsl; then + AC_MSG_RESULT($d) + DSSSL_DIR=$d + break + fi + done + if test -z "$DSSSL_DIR"; then + AC_MSG_RESULT(Not found) + fi +]) +AC_SUBST(XSL_DIR) +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 + fi +],[ + AC_MSG_CHECKING(for htmlhelp.xsl) + for d in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \ + /usr/share/sgml/docbook/xsl-stylesheets-1.* + do + if test -f $d/htmlhelp/htmlhelp.xsl; then + AC_MSG_RESULT($d) + XSL_DIR=$d + break + fi + done + if test -z "$XSL_DIR"; then + AC_MSG_RESULT(Not found) + fi +]) +]) AC_DEFUN([YAZ_INIT], [ @@ -12,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-config, [ --with-yaz-config=DIR use yaz-config in DIR (example /home/yaz-1.7)], [yazpath=$withval]) if test "x$yazpath" != "xNONE"; then yazconfig=$yazpath/yaz-config else @@ -44,10 +117,21 @@ AC_DEFUN([YAZ_INIT], YAZINC=`$yazconfig --cflags $1` YAZVERSION=`$yazconfig --version` fi - AC_MSG_RESULT($yazconfig) + AC_MSG_RESULT([$yazconfig]) else AC_MSG_RESULT(Not found) YAZVERSION=NONE fi -]) - + if test "X$YAZVERSION" != "XNONE"; then + AC_MSG_CHECKING([for YAZ version]) + AC_MSG_RESULT([$YAZVERSION]) + if test "$2"; then + have_yaz_version=`echo "$YAZVERSION" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'` + req_yaz_version=`echo "$2" | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'` + if test "$have_yaz_version" -lt "$req_yaz_version"; then + AC_MSG_ERROR([$YAZVERSION. Requires $2 or later]) + fi + fi + fi +]) + -- 1.7.10.4