From e973eb3ceaeaf25735f8250aed8400c87ddcb9da Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 1 Mar 2000 11:06:09 +0000 Subject: [PATCH] Updated makefiles (again). --- LICENSE | 2 +- Makefile.in | 3 + README | 4 +- asn/Makefile.in | 3 + ccl/Makefile.in | 3 + client/Makefile.in | 3 + comstack/Makefile.in | 3 + configure | 206 ++++++++++++++++++++++++++++++++++----------- configure.in | 14 ++- doc/Makefile.am | 6 +- doc/Makefile.in | 9 +- doc/README | 3 - ill/Makefile.in | 3 + include/Makefile.in | 3 + include/yaz/Makefile.am | 4 +- include/yaz/Makefile.in | 5 +- include/yaz/ill-core.h | 2 +- include/yaz/item-req.h | 2 +- include/yaz/z-accdes1.h | 2 +- include/yaz/z-accform1.h | 2 +- include/yaz/z-acckrb1.h | 2 +- include/yaz/z-core.h | 2 +- include/yaz/z-date.h | 2 +- include/yaz/z-diag1.h | 2 +- include/yaz/z-espec1.h | 2 +- include/yaz/z-estask.h | 2 +- include/yaz/z-exp.h | 2 +- include/yaz/z-grs.h | 2 +- include/yaz/z-opac.h | 2 +- include/yaz/z-rrf1.h | 2 +- include/yaz/z-rrf2.h | 2 +- include/yaz/z-sum.h | 2 +- include/yaz/z-sutrs.h | 2 +- include/yaz/z-uifr1.h | 2 +- include/yaz/z-univ.h | 2 +- include/yaz/zes-expi.h | 2 +- include/yaz/zes-exps.h | 2 +- include/yaz/zes-order.h | 2 +- include/yaz/zes-pquery.h | 2 +- include/yaz/zes-psched.h | 2 +- include/yaz/zes-pset.h | 2 +- include/yaz/zes-update0.h | 2 +- lib/Makefile.in | 3 + odr/Makefile.in | 3 + retrieval/Makefile.in | 3 + server/Makefile.in | 3 + tab/Makefile.in | 3 + util/Makefile.in | 3 + yaz.spec | 1 + z39.50/Makefile.in | 3 + z39.50/zes-expi.c | 2 +- z39.50/zes-exps.c | 2 +- z39.50/zes-order.c | 2 +- z39.50/zes-pquery.c | 2 +- z39.50/zes-psched.c | 2 +- z39.50/zes-pset.c | 2 +- z39.50/zes-update0.c | 2 +- ztest/Makefile.in | 3 + zutil/Makefile.in | 3 + 59 files changed, 269 insertions(+), 99 deletions(-) delete mode 100644 doc/README diff --git a/LICENSE b/LICENSE index 42fb75c..c27e7ce 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-1999 Index Data. + * Copyright (c) 1995-2000, Index Data. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation, in whole or in part, for any purpose, is hereby granted, diff --git a/Makefile.in b/Makefile.in index f026688..515acd9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ AUTOMAKE_OPTIONS = foreign diff --git a/README b/README index e7f015a..fc57ea7 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ -Copyright (C) 1995-1999, Index Data ApS. +Copyright (C) 1995-2000, Index Data ApS. See the file LICENSE for details. Compilation and installation instructions for YAZ - $Id: README,v 1.29 1999-12-16 23:36:19 adam Exp $ + $Id: README,v 1.30 2000-03-01 11:06:09 adam Exp $ The primary output of the source here is the lib/libyaz.a library, which contains support functions for implementing the server or client diff --git a/asn/Makefile.in b/asn/Makefile.in index 0cb1af7..71338bf 100644 --- a/asn/Makefile.in +++ b/asn/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ noinst_LIBRARIES = libasn.a diff --git a/ccl/Makefile.in b/ccl/Makefile.in index 1a24a6c..66440d1 100644 --- a/ccl/Makefile.in +++ b/ccl/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ noinst_LIBRARIES = libccl.a diff --git a/client/Makefile.in b/client/Makefile.in index 1f6afca..0971633 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ bin_PROGRAMS = yaz-client diff --git a/comstack/Makefile.in b/comstack/Makefile.in index 6a7d1b6..69e3acf 100644 --- a/comstack/Makefile.in +++ b/comstack/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ noinst_LIBRARIES = libcomstack.a diff --git a/configure b/configure index 24b194a..bf7729a 100755 --- a/configure +++ b/configure @@ -12,7 +12,7 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --enable-yc compile using YAZ' ASN.1 Compiler" + --disable-yc use old encoders, i.e. disable YAZ ASN.1 Compiler" ac_help="$ac_help --enable-tcpd enable TCP wrapper for server if available" ac_help="$ac_help @@ -1175,6 +1175,113 @@ else echo "$ac_t""no" 1>&6 fi +for ac_prog in sgml2txt +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1184: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_have_sgml2txt'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$have_sgml2txt"; then + ac_cv_prog_have_sgml2txt="$have_sgml2txt" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_have_sgml2txt="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +have_sgml2txt="$ac_cv_prog_have_sgml2txt" +if test -n "$have_sgml2txt"; then + echo "$ac_t""$have_sgml2txt" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$have_sgml2txt" && break +done + +for ac_prog in sgml2latex +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1218: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_have_sgml2latex'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$have_sgml2latex"; then + ac_cv_prog_have_sgml2latex="$have_sgml2latex" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_have_sgml2latex="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +have_sgml2latex="$ac_cv_prog_have_sgml2latex" +if test -n "$have_sgml2latex"; then + echo "$ac_t""$have_sgml2latex" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$have_sgml2latex" && break +done + +for ac_prog in sgml2html +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1252: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_have_sgml2html'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$have_sgml2html"; then + ac_cv_prog_have_sgml2html="$have_sgml2html" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_have_sgml2html="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +have_sgml2html="$ac_cv_prog_have_sgml2html" +if test -n "$have_sgml2html"; then + echo "$ac_t""$have_sgml2html" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$have_sgml2html" && break +done + +if test "$have_sgml2txt" = "no" -o "$have_sgml2latex" = "no" - "$have_sgml2html" = "no"; then + DOCMODULE="" +else + DOCMODULE="doc" +fi @@ -1201,12 +1308,12 @@ else fi checkBoth=0 echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1205: checking for connect" >&5 +echo "configure:1312: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1250,7 +1357,7 @@ fi if test "$ac_cv_func_connect" = "no"; then echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:1254: checking for main in -lsocket" >&5 +echo "configure:1361: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1258,14 +1365,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1291,12 +1398,12 @@ if test "$checkBoth" = "1"; then oldLibs=$LIBS LIBS="$LIBS -lsocket -lnsl" echo $ac_n "checking for accept""... $ac_c" 1>&6 -echo "configure:1295: checking for accept" >&5 +echo "configure:1402: checking for accept" >&5 if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_accept=yes" else @@ -1341,12 +1448,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1345: checking for gethostbyname" >&5 +echo "configure:1452: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1387,7 +1494,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:1391: checking for main in -lnsl" >&5 +echo "configure:1498: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1395,14 +1502,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1425,7 +1532,7 @@ fi fi echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:1429: checking for readline in -lreadline" >&5 +echo "configure:1536: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1433,7 +1540,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1466,7 +1573,7 @@ fi if test "$ac_cv_lib_readline_readline" = "no"; then echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:1470: checking for readline in -lreadline" >&5 +echo "configure:1577: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1474,7 +1581,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1507,7 +1614,7 @@ fi fi echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6 -echo "configure:1511: checking for add_history in -lhistory" >&5 +echo "configure:1618: checking for add_history in -lhistory" >&5 ac_lib_var=`echo history'_'add_history | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1515,7 +1622,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lhistory $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1551,17 +1658,17 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1555: checking for $ac_hdr" >&5 +echo "configure:1662: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1596,11 +1703,11 @@ fi if test "$enable_tcpd" = "yes"; then echo $ac_n "checking for working tcpd.h""... $ac_c" 1>&6 -echo "configure:1600: checking for working tcpd.h" >&5 +echo "configure:1707: checking for working tcpd.h" >&5 oldLibs=$LIBS LIBS="$LIBS -lwrap -lnsl" cat > conftest.$ac_ext < #include @@ -1611,7 +1718,7 @@ struct request_info request_info; int i; i = hosts_access(&request_info); ; return 0; } EOF -if { (eval echo configure:1615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcpd_ok=1 else @@ -1633,12 +1740,12 @@ EOF fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1637: checking for ANSI C header files" >&5 +echo "configure:1744: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1646,7 +1753,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1663,7 +1770,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1681,7 +1788,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1702,7 +1809,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1713,7 +1820,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1750,17 +1857,17 @@ if test "$enable_threads" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1754: checking for $ac_hdr" >&5 +echo "configure:1861: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1787,12 +1894,12 @@ fi done echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6 -echo "configure:1791: checking for pthread_mutex_lock" >&5 +echo "configure:1898: checking for pthread_mutex_lock" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_mutex_lock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_mutex_lock=yes" else @@ -1836,7 +1943,7 @@ fi if test "$ac_cv_func_pthread_mutex_lock" = "no"; then echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 -echo "configure:1840: checking for main in -lpthread" >&5 +echo "configure:1947: checking for main in -lpthread" >&5 ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1844,14 +1951,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1884,7 +1991,7 @@ fi EOF fi -SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest" +SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest $DOCMODULE" trap '' 1 2 15 cat > confcache <<\EOF @@ -2045,6 +2152,9 @@ s%@SET_MAKE@%$SET_MAKE%g s%@CC@%$CC%g s%@CPP@%$CPP%g s%@RANLIB@%$RANLIB%g +s%@have_sgml2txt@%$have_sgml2txt%g +s%@have_sgml2latex@%$have_sgml2latex%g +s%@have_sgml2html@%$have_sgml2html%g s%@ASNMODULE@%$ASNMODULE%g s%@ILLMODULE@%$ILLMODULE%g s%@ILLLIB@%$ILLLIB%g diff --git a/configure.in b/configure.in index 5c7b506..7db122a 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl YAZ Toolkit dnl (c) Index Data 1994-2000 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.18 2000-02-29 15:52:33 adam Exp $ +dnl $Id: configure.in,v 1.19 2000-03-01 11:06:09 adam Exp $ AC_INIT(include/yaz/yaz-version.h) AM_INIT_AUTOMAKE(yaz, 1.6) dnl @@ -10,12 +10,20 @@ AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL AC_PROG_RANLIB +AC_CHECK_PROGS(have_sgml2txt,sgml2txt) +AC_CHECK_PROGS(have_sgml2latex,sgml2latex) +AC_CHECK_PROGS(have_sgml2html,sgml2html) +if test "$have_sgml2txt" = "no" -o "$have_sgml2latex" = "no" - "$have_sgml2html" = "no"; then + DOCMODULE="" +else + DOCMODULE="doc" +fi dnl dnl ----- YC: The Yaz Compiler AC_SUBST(ASNMODULE) AC_SUBST(ILLMODULE) AC_SUBST(ILLLIB) -AC_ARG_ENABLE(yc,[ --enable-yc compile using YAZ' ASN.1 Compiler], , enable_yc=yes) +AC_ARG_ENABLE(yc,[ --disable-yc use old encoders, i.e. disable YAZ ASN.1 Compiler], , enable_yc=yes) if test "$enable_yc" = "yes"; then ASNMODULE="z39.50" ILLMODULE="ill" @@ -91,7 +99,7 @@ if test "$enable_threads" = "yes"; then AC_DEFINE(_REENTRANT) fi dnl -SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest" +SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest $DOCMODULE" AC_SUBST(SUBDIRS_VAR) dnl dnl ------ Makefiles diff --git a/doc/Makefile.am b/doc/Makefile.am index 2d58397..3e9456c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,14 +1,14 @@ -## $Id: Makefile.am,v 1.4 2000-02-29 13:52:36 adam Exp $ +## $Id: Makefile.am,v 1.5 2000-03-01 11:06:09 adam Exp $ docdir=$(pkgdatadir)/doc doc_DATA = \ - yaz.sgml yaz.txt yaz.ps profiles.txt profiles.ps yaz.html \ + yaz.sgml yaz.txt yaz.ps profiles.sgml profiles.txt profiles.ps yaz.html \ yaz-1.html yaz-2.html yaz-3.html yaz-4.html yaz-5.html \ yaz-6.html yaz-7.html yaz-8.html yaz-9.html EXTRA_DIST = \ - yaz.sgml yaz.txt yaz.ps profiles.txt profiles.ps yaz.html \ + yaz.sgml yaz.txt yaz.ps profiles.sgml profiles.txt profiles.ps yaz.html \ yaz-1.html yaz-2.html yaz-3.html yaz-4.html yaz-5.html \ yaz-6.html yaz-7.html yaz-8.html yaz-9.html diff --git a/doc/Makefile.in b/doc/Makefile.in index 6d0d756..d11840c 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -67,19 +67,22 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ docdir = $(pkgdatadir)/doc -doc_DATA = yaz.sgml yaz.txt yaz.ps profiles.txt profiles.ps yaz.html yaz-1.html yaz-2.html yaz-3.html yaz-4.html yaz-5.html yaz-6.html yaz-7.html yaz-8.html yaz-9.html +doc_DATA = yaz.sgml yaz.txt yaz.ps profiles.sgml profiles.txt profiles.ps yaz.html yaz-1.html yaz-2.html yaz-3.html yaz-4.html yaz-5.html yaz-6.html yaz-7.html yaz-8.html yaz-9.html -EXTRA_DIST = yaz.sgml yaz.txt yaz.ps profiles.txt profiles.ps yaz.html yaz-1.html yaz-2.html yaz-3.html yaz-4.html yaz-5.html yaz-6.html yaz-7.html yaz-8.html yaz-9.html +EXTRA_DIST = yaz.sgml yaz.txt yaz.ps profiles.sgml profiles.txt profiles.ps yaz.html yaz-1.html yaz-2.html yaz-3.html yaz-4.html yaz-5.html yaz-6.html yaz-7.html yaz-8.html yaz-9.html mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DATA = $(doc_DATA) -DIST_COMMON = README Makefile.am Makefile.in +DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/doc/README b/doc/README deleted file mode 100644 index 6a6670b..0000000 --- a/doc/README +++ /dev/null @@ -1,3 +0,0 @@ -To download the documentation for YAZ in postscript or ASCII, look -at the FTP site where you retrieved this software, or at -http://www.indexdata.dk/yaz diff --git a/ill/Makefile.in b/ill/Makefile.in index c996591..f1776f9 100644 --- a/ill/Makefile.in +++ b/ill/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ INCLUDES = -I../include diff --git a/include/Makefile.in b/include/Makefile.in index ab8bf8e..31e1f8d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ AUTOMAKE_OPTIONS = foreign diff --git a/include/yaz/Makefile.am b/include/yaz/Makefile.am index a42b1dc..ea8ebd2 100644 --- a/include/yaz/Makefile.am +++ b/include/yaz/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.6 2000-02-29 15:52:33 adam Exp $ +## $Id: Makefile.am,v 1.7 2000-03-01 11:06:09 adam Exp $ pkginclude_HEADERS= backend.h ccl.h comstack.h \ d1_attset.h d1_map.h data1.h diagbib1.h \ @@ -13,5 +13,5 @@ pkginclude_HEADERS= backend.h ccl.h comstack.h \ \ zes-pset.h zes-update.h zes-update0.h \ prt-acc.h prt-add.h prt-arc.h prt-dat.h prt-dia.h prt-esp.h \ - prt-exd.h prt-exp.h prt-grs.h prt-proto.h prt-rsc.h + prt-exd.h prt-exp.h prt-grs.h prt-proto.h prt-rsc.h prt-univ.h diff --git a/include/yaz/Makefile.in b/include/yaz/Makefile.in index 7020660..f46e7ab 100644 --- a/include/yaz/Makefile.in +++ b/include/yaz/Makefile.in @@ -67,8 +67,11 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ -pkginclude_HEADERS = backend.h ccl.h comstack.h d1_attset.h d1_map.h data1.h diagbib1.h log.h logrpn.h marcdisp.h nmem.h odr.h oid.h options.h otherinfo.h pquery.h prt-ext.h readconf.h statserv.h tcpip.h tpath.h wrbuf.h xmalloc.h yaz-ccl.h yaz-util.h yaz-version.h yconfig.h proto.h ill.h ill-core.h item-req.h z-accdes1.h z-accform1.h z-acckrb1.h z-core.h z-date.h z-diag1.h z-espec1.h z-estask.h z-exp.h z-grs.h z-opac.h z-proto.h z-rrf1.h z-rrf2.h z-sum.h z-sutrs.h z-uifr1.h z-univ.h zes-expi.h zes-exps.h zes-order.h zes-pquery.h zes-psched.h zes-pset.h zes-update.h zes-update0.h prt-acc.h prt-add.h prt-arc.h prt-dat.h prt-dia.h prt-esp.h prt-exd.h prt-exp.h prt-grs.h prt-proto.h prt-rsc.h +pkginclude_HEADERS = backend.h ccl.h comstack.h d1_attset.h d1_map.h data1.h diagbib1.h log.h logrpn.h marcdisp.h nmem.h odr.h oid.h options.h otherinfo.h pquery.h prt-ext.h readconf.h statserv.h tcpip.h tpath.h wrbuf.h xmalloc.h yaz-ccl.h yaz-util.h yaz-version.h yconfig.h proto.h ill.h ill-core.h item-req.h z-accdes1.h z-accform1.h z-acckrb1.h z-core.h z-date.h z-diag1.h z-espec1.h z-estask.h z-exp.h z-grs.h z-opac.h z-proto.h z-rrf1.h z-rrf2.h z-sum.h z-sutrs.h z-uifr1.h z-univ.h zes-expi.h zes-exps.h zes-order.h zes-pquery.h zes-psched.h zes-pset.h zes-update.h zes-update0.h prt-acc.h prt-add.h prt-arc.h prt-dat.h prt-dia.h prt-esp.h prt-exd.h prt-exp.h prt-grs.h prt-proto.h prt-rsc.h prt-univ.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = diff --git a/include/yaz/ill-core.h b/include/yaz/ill-core.h index e324f2e..a42c586 100644 --- a/include/yaz/ill-core.h +++ b/include/yaz/ill-core.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:17 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:16 CET 2000 */ /* Module-H ISO-10161-ILL-1 */ #ifndef ill_core_H diff --git a/include/yaz/item-req.h b/include/yaz/item-req.h index d0f0232..683e81b 100644 --- a/include/yaz/item-req.h +++ b/include/yaz/item-req.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:19 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:17 CET 2000 */ /* Module-H Z39.50-extendedService-ItemOrder-ItemRequest-1 */ #ifndef item_req_H diff --git a/include/yaz/z-accdes1.h b/include/yaz/z-accdes1.h index f207a64..f0bb4ce 100644 --- a/include/yaz/z-accdes1.h +++ b/include/yaz/z-accdes1.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H AccessControlFormat-des-1 */ #ifndef z_accdes1_H diff --git a/include/yaz/z-accform1.h b/include/yaz/z-accform1.h index 390e0fd..13e7063 100644 --- a/include/yaz/z-accform1.h +++ b/include/yaz/z-accform1.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H AccessControlFormat-prompt-1 */ #ifndef z_accform1_H diff --git a/include/yaz/z-acckrb1.h b/include/yaz/z-acckrb1.h index 218a526..78fa28c 100644 --- a/include/yaz/z-acckrb1.h +++ b/include/yaz/z-acckrb1.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H AccessControlFormat-krb-1 */ #ifndef z_acckrb1_H diff --git a/include/yaz/z-core.h b/include/yaz/z-core.h index 7b5d250..2a97695 100644 --- a/include/yaz/z-core.h +++ b/include/yaz/z-core.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:06 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:10 CET 2000 */ /* Module-H Z39-50-APDU-1995 */ #ifndef z_core_H diff --git a/include/yaz/z-date.h b/include/yaz/z-date.h index efa27a0..4ade778 100644 --- a/include/yaz/z-date.h +++ b/include/yaz/z-date.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:14 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:13 CET 2000 */ /* Module-H UserInfoFormat-dateTime */ #ifndef z_date_H diff --git a/include/yaz/z-diag1.h b/include/yaz/z-diag1.h index 7051fcd..45842cc 100644 --- a/include/yaz/z-diag1.h +++ b/include/yaz/z-diag1.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:06 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:11 CET 2000 */ /* Module-H DiagnosticFormatDiag1 */ #ifndef z_diag1_H diff --git a/include/yaz/z-espec1.h b/include/yaz/z-espec1.h index a470b00..b7821bb 100644 --- a/include/yaz/z-espec1.h +++ b/include/yaz/z-espec1.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H ElementSpecificationFormat-eSpec-1 */ #ifndef z_espec1_H diff --git a/include/yaz/z-estask.h b/include/yaz/z-estask.h index d1937ef..2a8ab71 100644 --- a/include/yaz/z-estask.h +++ b/include/yaz/z-estask.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H RecordSyntax-ESTaskPackage */ #ifndef z_estask_H diff --git a/include/yaz/z-exp.h b/include/yaz/z-exp.h index 11dcb0a..c925051 100644 --- a/include/yaz/z-exp.h +++ b/include/yaz/z-exp.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:06 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:11 CET 2000 */ /* Module-H RecordSyntax-explain */ #ifndef z_exp_H diff --git a/include/yaz/z-grs.h b/include/yaz/z-grs.h index 98d37cd..9981c46 100644 --- a/include/yaz/z-grs.h +++ b/include/yaz/z-grs.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H RecordSyntax-generic */ #ifndef z_grs_H diff --git a/include/yaz/z-opac.h b/include/yaz/z-opac.h index 1ed2674..594981d 100644 --- a/include/yaz/z-opac.h +++ b/include/yaz/z-opac.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:06 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H RecordSyntax-opac */ #ifndef z_opac_H diff --git a/include/yaz/z-rrf1.h b/include/yaz/z-rrf1.h index f258a1a..aabb1f7 100644 --- a/include/yaz/z-rrf1.h +++ b/include/yaz/z-rrf1.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H ResourceReport-Format-Resource-1 */ #ifndef z_rrf1_H diff --git a/include/yaz/z-rrf2.h b/include/yaz/z-rrf2.h index 8230485..a33bbf2 100644 --- a/include/yaz/z-rrf2.h +++ b/include/yaz/z-rrf2.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H ResourceReport-Format-Resource-2 */ #ifndef z_rrf2_H diff --git a/include/yaz/z-sum.h b/include/yaz/z-sum.h index b868fe2..36de11d 100644 --- a/include/yaz/z-sum.h +++ b/include/yaz/z-sum.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:06 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H RecordSyntax-summary */ #ifndef z_sum_H diff --git a/include/yaz/z-sutrs.h b/include/yaz/z-sutrs.h index a9b8276..17986b4 100644 --- a/include/yaz/z-sutrs.h +++ b/include/yaz/z-sutrs.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:06 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H RecordSyntax-SUTRS */ #ifndef z_sutrs_H diff --git a/include/yaz/z-uifr1.h b/include/yaz/z-uifr1.h index c28dee1..d6b029f 100644 --- a/include/yaz/z-uifr1.h +++ b/include/yaz/z-uifr1.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H UserInfoFormat-searchResult-1 */ #ifndef z_uifr1_H diff --git a/include/yaz/z-univ.h b/include/yaz/z-univ.h index eccf5f1..1e85ae7 100644 --- a/include/yaz/z-univ.h +++ b/include/yaz/z-univ.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:14 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:13 CET 2000 */ /* Module-H ResourceReport-Format-Universe-1 */ #ifndef z_univ_H diff --git a/include/yaz/zes-expi.h b/include/yaz/zes-expi.h index 6b6d297..c1fc994 100644 --- a/include/yaz/zes-expi.h +++ b/include/yaz/zes-expi.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H ESFormat-ExportInvocation */ #ifndef zes_expi_H diff --git a/include/yaz/zes-exps.h b/include/yaz/zes-exps.h index 9ee6330..fa4b192 100644 --- a/include/yaz/zes-exps.h +++ b/include/yaz/zes-exps.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H ESFormat-ExportSpecification */ #ifndef zes_exps_H diff --git a/include/yaz/zes-order.h b/include/yaz/zes-order.h index 03b8f77..cd56e32 100644 --- a/include/yaz/zes-order.h +++ b/include/yaz/zes-order.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H ESFormat-ItemOrder */ #ifndef zes_order_H diff --git a/include/yaz/zes-pquery.h b/include/yaz/zes-pquery.h index 4607256..8617a34 100644 --- a/include/yaz/zes-pquery.h +++ b/include/yaz/zes-pquery.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H ESFormat-PersistentQuery */ #ifndef zes_pquery_H diff --git a/include/yaz/zes-psched.h b/include/yaz/zes-psched.h index c82d854..1b88195 100644 --- a/include/yaz/zes-psched.h +++ b/include/yaz/zes-psched.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H ESFormat-PeriodicQuerySchedule */ #ifndef zes_psched_H diff --git a/include/yaz/zes-pset.h b/include/yaz/zes-pset.h index 11c890e..63d7b8e 100644 --- a/include/yaz/zes-pset.h +++ b/include/yaz/zes-pset.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H ESFormat-PersistentResultSet */ #ifndef zes_pset_H diff --git a/include/yaz/zes-update0.h b/include/yaz/zes-update0.h index e86a065..c383b44 100644 --- a/include/yaz/zes-update0.h +++ b/include/yaz/zes-update0.h @@ -1,4 +1,4 @@ -/* YC 0.2: Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2: Wed Mar 01 10:28:12 CET 2000 */ /* Module-H ESFormat-Update0 */ #ifndef zes_update0_H diff --git a/lib/Makefile.in b/lib/Makefile.in index 4b218b7..0a1db67 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ lib_LIBRARIES = libyaz.a diff --git a/odr/Makefile.in b/odr/Makefile.in index 9ce5438..8a16265 100644 --- a/odr/Makefile.in +++ b/odr/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ noinst_LIBRARIES = libodr.a diff --git a/retrieval/Makefile.in b/retrieval/Makefile.in index 4ad61d4..f067597 100644 --- a/retrieval/Makefile.in +++ b/retrieval/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ noinst_LIBRARIES = libret.a diff --git a/server/Makefile.in b/server/Makefile.in index 0860c3b..35a835d 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ noinst_LIBRARIES = libserver.a diff --git a/tab/Makefile.in b/tab/Makefile.in index 7427367..f987d0e 100644 --- a/tab/Makefile.in +++ b/tab/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ tabdatadir = $(pkgdatadir)/tab tabdata_DATA = bib1.att dan1.att danmarc.abs explain.abs explain.att explain.tag generic.tag gils-a.est gils-b.est gils-f.est gils-g.est gils-summary.map gils-usmarc.map gils-variant.est gils.abs gils.att gils.tag meta-b.est meta-usmarc.map meta.abs meta.tag summary.abs summary.tag tagsetg.tag tagsetm.tag usmarc-b.est usmarc.abs usmarc.mar usmarc.tag var1.var wais-b.est wais-variant.est wais.abs diff --git a/util/Makefile.in b/util/Makefile.in index 99cd311..f020c31 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ noinst_LIBRARIES = libutil.a EXTRA_DIST = yc.tcl diff --git a/yaz.spec b/yaz.spec index fdf8c6c..f86c8f1 100644 --- a/yaz.spec +++ b/yaz.spec @@ -37,3 +37,4 @@ make prefix=$RPM_BUILD_ROOT/usr install /usr/bin/yaz-config /usr/lib/libyaz.a /usr/include/yaz +/usr/share/yaz/doc diff --git a/z39.50/Makefile.in b/z39.50/Makefile.in index 49bd6b7..791eed5 100644 --- a/z39.50/Makefile.in +++ b/z39.50/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ INCLUDES = -I../include diff --git a/z39.50/zes-expi.c b/z39.50/zes-expi.c index 430f909..749ef18 100644 --- a/z39.50/zes-expi.c +++ b/z39.50/zes-expi.c @@ -1,4 +1,4 @@ -/* YC 0.2 Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2 Wed Mar 01 10:28:12 CET 2000 */ /* Module-C: ESFormat-ExportInvocation */ #include diff --git a/z39.50/zes-exps.c b/z39.50/zes-exps.c index 4da0edf..75e7ddf 100644 --- a/z39.50/zes-exps.c +++ b/z39.50/zes-exps.c @@ -1,4 +1,4 @@ -/* YC 0.2 Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2 Wed Mar 01 10:28:12 CET 2000 */ /* Module-C: ESFormat-ExportSpecification */ #include diff --git a/z39.50/zes-order.c b/z39.50/zes-order.c index 9a2e9d8..36acc36 100644 --- a/z39.50/zes-order.c +++ b/z39.50/zes-order.c @@ -1,4 +1,4 @@ -/* YC 0.2 Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2 Wed Mar 01 10:28:12 CET 2000 */ /* Module-C: ESFormat-ItemOrder */ #include diff --git a/z39.50/zes-pquery.c b/z39.50/zes-pquery.c index bdf2605..e78a0d1 100644 --- a/z39.50/zes-pquery.c +++ b/z39.50/zes-pquery.c @@ -1,4 +1,4 @@ -/* YC 0.2 Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2 Wed Mar 01 10:28:12 CET 2000 */ /* Module-C: ESFormat-PersistentQuery */ #include diff --git a/z39.50/zes-psched.c b/z39.50/zes-psched.c index 0cc0fdb..1b2ae28 100644 --- a/z39.50/zes-psched.c +++ b/z39.50/zes-psched.c @@ -1,4 +1,4 @@ -/* YC 0.2 Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2 Wed Mar 01 10:28:12 CET 2000 */ /* Module-C: ESFormat-PeriodicQuerySchedule */ #include diff --git a/z39.50/zes-pset.c b/z39.50/zes-pset.c index b9aaaaf..949340e 100644 --- a/z39.50/zes-pset.c +++ b/z39.50/zes-pset.c @@ -1,4 +1,4 @@ -/* YC 0.2 Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2 Wed Mar 01 10:28:12 CET 2000 */ /* Module-C: ESFormat-PersistentResultSet */ #include diff --git a/z39.50/zes-update0.c b/z39.50/zes-update0.c index 8ad90bd..f75bce6 100644 --- a/z39.50/zes-update0.c +++ b/z39.50/zes-update0.c @@ -1,4 +1,4 @@ -/* YC 0.2 Tue Feb 29 16:45:07 CET 2000 */ +/* YC 0.2 Wed Mar 01 10:28:12 CET 2000 */ /* Module-C: ESFormat-Update0 */ #include diff --git a/ztest/Makefile.in b/ztest/Makefile.in index 61e650f..1be2ef9 100644 --- a/ztest/Makefile.in +++ b/ztest/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ bin_PROGRAMS = yaz-ztest diff --git a/zutil/Makefile.in b/zutil/Makefile.in index 6e51ad4..758bf87 100644 --- a/zutil/Makefile.in +++ b/zutil/Makefile.in @@ -67,6 +67,9 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +have_sgml2html = @have_sgml2html@ +have_sgml2latex = @have_sgml2latex@ +have_sgml2txt = @have_sgml2txt@ noinst_LIBRARIES = libzutil.a -- 1.7.10.4