Documentation no longer made when doing 'make all'.

diff --git a/Makefile.am b/Makefile.am
index ea5aa36..229560b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.4 2000-02-29 15:52:33 adam Exp $
+## $Id: Makefile.am,v 1.5 2000-03-10 08:41:30 adam Exp $
 
 AUTOMAKE_OPTIONS = foreign 
 
@@ -20,6 +20,7 @@ yaz-config:
        chmod +x yaz-config
 
 dist-hook:
+       cd doc; make
        mkdir $(distdir)/win
        -cp $(srcdir)/win/* $(distdir)/win
 

diff --git a/Makefile.in b/Makefile.in
index 515acd9..2605a4d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,9 +67,6 @@ 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 
 
@@ -344,6 +341,7 @@ yaz-config:
        chmod +x yaz-config
 
 dist-hook:
+       cd doc; make
        mkdir $(distdir)/win
        -cp $(srcdir)/win/* $(distdir)/win
 

diff --git a/asn/Makefile.in b/asn/Makefile.in
index 71338bf..0cb1af7 100644 (file)
--- a/asn/Makefile.in
+++ b/asn/Makefile.in
@@ -67,9 +67,6 @@ 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 66440d1..1a24a6c 100644 (file)
--- a/ccl/Makefile.in
+++ b/ccl/Makefile.in
@@ -67,9 +67,6 @@ 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 0971633..1f6afca 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -67,9 +67,6 @@ 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 69e3acf..6a7d1b6 100644 (file)
--- a/comstack/Makefile.in
+++ b/comstack/Makefile.in
@@ -67,9 +67,6 @@ 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 1aec98d..9381f90 100755 (executable)
--- a/configure
+++ b/configure
@@ -1175,116 +1175,6 @@ 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
-test -n "$have_sgml2txt" || have_sgml2txt="no"
-
-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:1219: 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
-test -n "$have_sgml2latex" || have_sgml2latex="no"
-
-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:1254: 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
-test -n "$have_sgml2html" || have_sgml2html="no"
-
-if test "$have_sgml2txt" = "no" -o "$have_sgml2latex" = "no" -o "$have_sgml2html" = "no"; then
-       DOCMODULE=""
-else
-       DOCMODULE="doc"
-fi
 
 
 
@@ -1311,12 +1201,12 @@ else
 fi
 checkBoth=0
 echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:1315: checking for connect" >&5
+echo "configure:1205: 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 <<EOF
-#line 1320 "configure"
+#line 1210 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -1339,7 +1229,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1233: \"$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
@@ -1360,7 +1250,7 @@ fi
 
 if test "$ac_cv_func_connect" = "no"; then
        echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:1364: checking for main in -lsocket" >&5
+echo "configure:1254: 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
@@ -1368,14 +1258,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1372 "configure"
+#line 1262 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1269: \"$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
@@ -1401,12 +1291,12 @@ if test "$checkBoth" = "1"; then
        oldLibs=$LIBS
        LIBS="$LIBS -lsocket -lnsl"
        echo $ac_n "checking for accept""... $ac_c" 1>&6
-echo "configure:1405: checking for accept" >&5
+echo "configure:1295: 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 <<EOF
-#line 1410 "configure"
+#line 1300 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char accept(); below.  */
@@ -1429,7 +1319,7 @@ accept();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1323: \"$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
@@ -1451,12 +1341,12 @@ fi
 
 fi
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:1455: checking for gethostbyname" >&5
+echo "configure:1345: 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 <<EOF
-#line 1460 "configure"
+#line 1350 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -1479,7 +1369,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1373: \"$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
@@ -1497,7 +1387,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:1501: checking for main in -lnsl" >&5
+echo "configure:1391: 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
@@ -1505,14 +1395,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1509 "configure"
+#line 1399 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1406: \"$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
@@ -1535,7 +1425,7 @@ fi
 fi
 
 echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:1539: checking for readline in -lreadline" >&5
+echo "configure:1429: 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
@@ -1543,7 +1433,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1547 "configure"
+#line 1437 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1554,7 +1444,7 @@ int main() {
 readline()
 ; return 0; }
 EOF
-if { (eval echo configure:1558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1448: \"$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
@@ -1576,7 +1466,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:1580: checking for readline in -lreadline" >&5
+echo "configure:1470: 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
@@ -1584,7 +1474,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1588 "configure"
+#line 1478 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1595,7 +1485,7 @@ int main() {
 readline()
 ; return 0; }
 EOF
-if { (eval echo configure:1599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1489: \"$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
@@ -1617,7 +1507,7 @@ fi
 
 fi
 echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
-echo "configure:1621: checking for add_history in -lhistory" >&5
+echo "configure:1511: 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
@@ -1625,7 +1515,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lhistory  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1629 "configure"
+#line 1519 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1636,7 +1526,7 @@ int main() {
 add_history()
 ; return 0; }
 EOF
-if { (eval echo configure:1640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1530: \"$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
@@ -1661,17 +1551,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:1665: checking for $ac_hdr" >&5
+echo "configure:1555: 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
-#line 1670 "configure"
+#line 1560 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1565: \"$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*
@@ -1706,11 +1596,11 @@ fi
 
 if test "$enable_tcpd" = "yes"; then
        echo $ac_n "checking for working tcpd.h""... $ac_c" 1>&6
-echo "configure:1710: checking for working tcpd.h" >&5
+echo "configure:1600: checking for working tcpd.h" >&5
        oldLibs=$LIBS
        LIBS="$LIBS -lwrap -lnsl"
        cat > conftest.$ac_ext <<EOF
-#line 1714 "configure"
+#line 1604 "configure"
 #include "confdefs.h"
 #include <syslog.h>
        #include <tcpd.h>
@@ -1721,7 +1611,7 @@ struct request_info request_info; int i;
        i = hosts_access(&request_info);
 ; return 0; }
 EOF
-if { (eval echo configure:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   tcpd_ok=1
 else
@@ -1743,12 +1633,12 @@ EOF
        fi
 fi
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1747: checking for ANSI C header files" >&5
+echo "configure:1637: 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 <<EOF
-#line 1752 "configure"
+#line 1642 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1756,7 +1646,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1650: \"$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*
@@ -1773,7 +1663,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
-#line 1777 "configure"
+#line 1667 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1791,7 +1681,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
-#line 1795 "configure"
+#line 1685 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1812,7 +1702,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1816 "configure"
+#line 1706 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1823,7 +1713,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1860,17 +1750,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:1864: checking for $ac_hdr" >&5
+echo "configure:1754: 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
-#line 1869 "configure"
+#line 1759 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1764: \"$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*
@@ -1897,12 +1787,12 @@ fi
 done
 
        echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6
-echo "configure:1901: checking for pthread_mutex_lock" >&5
+echo "configure:1791: 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 <<EOF
-#line 1906 "configure"
+#line 1796 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pthread_mutex_lock(); below.  */
@@ -1925,7 +1815,7 @@ pthread_mutex_lock();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1819: \"$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
@@ -1946,7 +1836,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:1950: checking for main in -lpthread" >&5
+echo "configure:1840: 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
@@ -1954,14 +1844,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1958 "configure"
+#line 1848 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1855: \"$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
@@ -1994,7 +1884,7 @@ fi
 EOF
 
 fi
-SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest $DOCMODULE"
+SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest"
 
 trap '' 1 2 15
 cat > confcache <<\EOF
@@ -2155,9 +2045,6 @@ 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 355dfc0..0b07849 100644 (file)
--- 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.22 2000-03-02 08:48:20 adam Exp $
+dnl $Id: configure.in,v 1.23 2000-03-10 08:41:30 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.6)
 dnl
@@ -10,14 +10,6 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
-AC_CHECK_PROGS(have_sgml2txt,sgml2txt,no)
-AC_CHECK_PROGS(have_sgml2latex,sgml2latex,no)
-AC_CHECK_PROGS(have_sgml2html,sgml2html,no)
-if test "$have_sgml2txt" = "no" -o "$have_sgml2latex" = "no" -o "$have_sgml2html" = "no"; then
-       DOCMODULE=""
-else
-       DOCMODULE="doc"
-fi
 dnl 
 dnl ----- yaz-comp: The Yaz Compiler
 AC_SUBST(ASNMODULE)
@@ -99,7 +91,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 $DOCMODULE"
+SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest"
 AC_SUBST(SUBDIRS_VAR)
 dnl
 dnl ------ Makefiles

diff --git a/doc/Makefile.in b/doc/Makefile.in
index d11840c..d2d1841 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -67,9 +67,6 @@ 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
 

diff --git a/doc/yaz.sgml b/doc/yaz.sgml
index a1c5c07..050344e 100644 (file)
--- a/doc/yaz.sgml
+++ b/doc/yaz.sgml
@@ -2,7 +2,7 @@
 <article>
 <title>YAZ User's Guide and Reference
 <author><htmlurl url="http://www.indexdata.dk/" name="Index Data">, <tt><htmlurl url="mailto:info@indexdata.dk" name="info@indexdata.dk"></>
-<date>$Revision: 1.5 $
+<date>$Revision: 1.6 $
 <abstract>
 This document is the programmer's guide and reference to the YAZ
 package. YAZ is a compact toolkit that provides access to the
@@ -190,11 +190,7 @@ When configured, build the software by typing:
   make
 </verb></tscreen>
 
-Developers that do modifications to <bf/YAZ/ may wish to run
-<tt>make depend</tt> as well to generate object-header file
-dependencies.
-
-The following files are generated by make
+The following files are generated by the make process:
 <descrip>
 <tag><tt>lib/libyaz.a</tt></tag> The <bf/YAZ/ programmers' library.
 
@@ -205,6 +201,9 @@ The following files are generated by make
 <tag><tt>yaz-config</tt></tag> A Bourne-shell script that holds build
 settings for <bf/YAZ/.
 
+<tag><tt>yaz-comp</tt></tag> The ASN.1 compiler for YAZ. Requires the
+Tcl Shell, tclsh, in current path to work. 
+
 </descrip>
 
 If you wish to install <bf/YAZ/ in system directories such as /usr/local/bin,
@@ -218,6 +217,17 @@ You probably need to have root access in order to perform this.
 You must specify the <tt>--prefix</tt> option for configure if you
 going to install in anything but /usr/local/.
 
+If you wish to perform an un-installation of YAZ you use:
+
+<tscreen><verb>
+  make uninstall
+</verb></tscreen>
+
+This will only work if you haven't reconfigured YAZ (and therefore
+changed installation prefix). Note that uninstall will not
+remove directories created by make install, e.g.
+<tt>/usr/local/include/yaz</tt>.
+
 <sect1>WIN32
 
 <p>

diff --git a/ill/Makefile.in b/ill/Makefile.in
index 32ffbd6..2c6cce1 100644 (file)
--- a/ill/Makefile.in
+++ b/ill/Makefile.in
@@ -67,9 +67,6 @@ 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 31e1f8d..ab8bf8e 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -67,9 +67,6 @@ 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.in b/include/yaz/Makefile.in
index f46e7ab..791d2ba 100644 (file)
--- a/include/yaz/Makefile.in
+++ b/include/yaz/Makefile.in
@@ -67,9 +67,6 @@ 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 prt-univ.h
 

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 0a1db67..4b218b7 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -67,9 +67,6 @@ 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 8a16265..9ce5438 100644 (file)
--- a/odr/Makefile.in
+++ b/odr/Makefile.in
@@ -67,9 +67,6 @@ 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 f067597..4ad61d4 100644 (file)
--- a/retrieval/Makefile.in
+++ b/retrieval/Makefile.in
@@ -67,9 +67,6 @@ 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 35a835d..0860c3b 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -67,9 +67,6 @@ 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 f987d0e..7427367 100644 (file)
--- a/tab/Makefile.in
+++ b/tab/Makefile.in
@@ -67,9 +67,6 @@ 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 288dbee..986103a 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -67,9 +67,6 @@ 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
 

diff --git a/yaz.spec b/yaz.spec
index d401bc9..d548a4c 100644 (file)
--- a/yaz.spec
+++ b/yaz.spec
@@ -1,7 +1,7 @@
 Summary: YAZ - A Z39.50 Library
 Name: yaz
 Version: 1.6
-Release: 1
+Release: 2
 Copyright: BSD
 Group: Development/Libraries
 Vendor: Index Data ApS <info@indexdata.dk>
@@ -13,7 +13,7 @@ Packager: Adam Dickmeiss <adam@indexdata.dk>
 %description
 The YAZ package is a developers' library for developing client - and
 server application using the ANSI/NISO Z39.50 protocol for Information
-Retrieval.
+Retrieval. YAZ' homepage is http://www.indexdata.dk/yaz/
 
 %prep
 %setup
@@ -27,6 +27,7 @@ make CFLAGS="$RPM_OPT_FLAGS"
 %install
 rm -fr $RPM_BUILD_ROOT
 make prefix=$RPM_BUILD_ROOT/usr install
+cd doc; make prefix=$RPM_BUILD_ROOT/usr install
 
 %files
 %defattr(-,root,root)

diff --git a/z39.50/Makefile.in b/z39.50/Makefile.in
index ce055b4..85f7c3d 100644 (file)
--- a/z39.50/Makefile.in
+++ b/z39.50/Makefile.in
@@ -67,9 +67,6 @@ 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/ztest/Makefile.in b/ztest/Makefile.in
index 1be2ef9..61e650f 100644 (file)
--- a/ztest/Makefile.in
+++ b/ztest/Makefile.in
@@ -67,9 +67,6 @@ 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 758bf87..6e51ad4 100644 (file)
--- a/zutil/Makefile.in
+++ b/zutil/Makefile.in
@@ -67,9 +67,6 @@ 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