From 19af2bd8dfd21731cc978beccd1346133d614c67 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 29 Feb 2000 13:44:54 +0000 Subject: [PATCH] Check for config.h (currently not generated). --- Makefile.am | 4 +- Makefile.in | 10 +- aclocal.m4 | 23 ----- asn/Makefile.in | 3 +- ccl/Makefile.in | 3 +- client/Makefile.am | 4 +- client/Makefile.in | 72 ++++--------- comstack/Makefile.in | 3 +- configure | 258 +++++++++++++++-------------------------------- configure.in | 4 +- doc/Makefile.am | 10 +- doc/Makefile.in | 9 +- ill/Makefile.in | 3 +- include/Makefile.in | 1 - include/yaz/Makefile.am | 10 +- include/yaz/Makefile.in | 66 +++--------- include/yaz/config.h.in | 30 ------ include/yaz/prt-ext.h | 10 +- include/yaz/yconfig.h | 4 - lib/Makefile.in | 3 +- odr/Makefile.in | 3 +- odr/ber_any.c | 9 +- odr/ber_bit.c | 10 +- odr/ber_bool.c | 11 +- odr/ber_int.c | 12 ++- odr/ber_len.c | 10 +- odr/ber_null.c | 10 +- odr/ber_oct.c | 10 +- odr/ber_oid.c | 10 +- odr/ber_tag.c | 10 +- odr/dumpber.c | 10 +- odr/odr.c | 8 +- odr/odr_any.c | 10 +- odr/odr_bit.c | 10 +- odr/odr_bool.c | 10 +- odr/odr_choice.c | 10 +- odr/odr_cons.c | 8 +- odr/odr_enum.c | 10 +- odr/odr_int.c | 10 +- odr/odr_mem.c | 8 +- odr/odr_null.c | 10 +- odr/odr_oct.c | 10 +- odr/odr_oid.c | 10 +- odr/odr_seq.c | 9 +- odr/odr_tag.c | 10 +- odr/odr_use.c | 10 +- odr/odr_util.c | 8 +- retrieval/Makefile.in | 3 +- server/Makefile.in | 3 +- tab/Makefile.in | 1 - util/Makefile.am | 5 +- util/Makefile.in | 6 +- util/atoin.c | 9 +- util/log.c | 9 +- util/marcdisp.c | 9 +- util/marcdump.c | 11 +- util/matchstr.c | 11 +- util/nmem.c | 10 +- util/nmemsdup.c | 10 +- util/oid.c | 8 +- util/options.c | 11 +- util/readconf.c | 10 +- util/tpath.c | 10 +- util/wrbuf.c | 11 +- util/xmalloc.c | 11 +- yaz.spec | 4 +- z39.50/Makefile.in | 3 +- ztest/Makefile.in | 3 +- zutil/Makefile.in | 3 +- 69 files changed, 471 insertions(+), 476 deletions(-) delete mode 100644 include/yaz/config.h.in diff --git a/Makefile.am b/Makefile.am index 730ef8e..c8c7796 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ -## $Id: Makefile.am,v 1.2 2000-02-28 11:44:39 adam Exp $ +## $Id: Makefile.am,v 1.3 2000-02-29 13:44:54 adam Exp $ -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign no-dependencies DIST_SUBDIRS=util odr z39.50 asn ill zutil comstack ccl tab retrieval server lib include client ztest doc diff --git a/Makefile.in b/Makefile.in index 7e54cfa..8af8e6f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -68,7 +68,7 @@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign no-dependencies DIST_SUBDIRS = util odr z39.50 asn ill zutil comstack ccl tab retrieval server lib include client ztest doc @@ -79,7 +79,6 @@ SPEC_FILE = $(PACKAGE).spec EXTRA_DIST = $(SPEC_FILE) README LICENSE CHANGELOG TODO windows.txt ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ./include/yaz/config.h CONFIG_CLEAN_FILES = SCRIPTS = $(noinst_SCRIPTS) @@ -96,7 +95,7 @@ all: all-redirect $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -235,11 +234,6 @@ distdir: $(DISTFILES) -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/aclocal.m4 b/aclocal.m4 index f23ba29..9f8add8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -102,26 +102,3 @@ else fi AC_SUBST($1)]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. - -AC_DEFUN(AM_CONFIG_HEADER, -[AC_PREREQ([2.12]) -AC_CONFIG_HEADER([$1]) -dnl When config.status generates a header, we must update the stamp-h file. -dnl This file resides in the same directory as the config header -dnl that is generated. We must strip everything past the first ":", -dnl and everything past the last "/". -AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl -ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, -<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, -<>; do - case " <<$>>CONFIG_HEADERS " in - *" <<$>>am_file "*<<)>> - echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx - ;; - esac - am_indx=`expr "<<$>>am_indx" + 1` -done<<>>dnl>>) -changequote([,]))]) - diff --git a/asn/Makefile.in b/asn/Makefile.in index 2003b14..0cb1af7 100644 --- a/asn/Makefile.in +++ b/asn/Makefile.in @@ -75,12 +75,11 @@ libasn_a_SOURCES = proto.c prt-rsc.c prt-acc.c prt-exp.c prt-grs.c prt-exd.c pr INCLUDES = -I../include mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../include/yaz +DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/ccl/Makefile.in b/ccl/Makefile.in index 85439fb..1a24a6c 100644 --- a/ccl/Makefile.in +++ b/ccl/Makefile.in @@ -79,12 +79,11 @@ libccl_a_SOURCES = cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c cclqfi cclsh_SOURCES = cclsh.c cclsh_LDADD = libccl.a mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../include/yaz +DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/client/Makefile.am b/client/Makefile.am index 16ad6fb..eaea1a2 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -1,6 +1,8 @@ ## Copyright (C) 1995-2000, Index Data ## All rights reserved. -## $Id: Makefile.am,v 1.2 2000-02-28 11:44:39 adam Exp $ +## $Id: Makefile.am,v 1.3 2000-02-29 13:44:55 adam Exp $ + +AUTOMAKE_OPTIONS=no-dependencies bin_PROGRAMS=yaz-client diff --git a/client/Makefile.in b/client/Makefile.in index 7f33a9f..71d04ea 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -68,6 +68,8 @@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +AUTOMAKE_OPTIONS = no-dependencies + bin_PROGRAMS = yaz-client yaz_client_SOURCES = client.c @@ -76,12 +78,11 @@ LDADD = ../lib/libyaz.a INCLUDES = -I../include -DCCLRPN=1 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) -DEFS = @DEFS@ -I. -I$(srcdir) -I../include/yaz +DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -100,7 +101,6 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = gtar GZIP_ENV = --best -DEP_FILES = .deps/client.P SOURCES = $(yaz_client_SOURCES) OBJECTS = $(yaz_client_OBJECTS) @@ -110,7 +110,7 @@ all: all-redirect $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu client/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -140,6 +140,9 @@ uninstall-binPROGRAMS: rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done +.c.o: + $(COMPILE) -c $< + .s.o: $(COMPILE) -c $< @@ -194,11 +197,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = client distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu client/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -209,38 +207,6 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - -DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) - --include $(DEP_FILES) - -mostlyclean-depend: - -clean-depend: - -distclean-depend: - -rm -rf .deps - -maintainer-clean-depend: - -%.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - -%.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -278,24 +244,23 @@ distclean-generic: maintainer-clean-generic: mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-tags mostlyclean-depend mostlyclean-generic + mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-am -clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \ - clean-generic mostlyclean-am +clean-am: clean-binPROGRAMS clean-compile clean-tags clean-generic \ + mostlyclean-am clean: clean-am distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ - distclean-depend distclean-generic clean-am + distclean-generic clean-am distclean: distclean-am maintainer-clean-am: maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-depend maintainer-clean-generic \ - distclean-am + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -305,13 +270,12 @@ maintainer-clean: maintainer-clean-am maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -distclean-depend clean-depend maintainer-clean-depend info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ +check-am installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/comstack/Makefile.in b/comstack/Makefile.in index d6ef7e2..6a7d1b6 100644 --- a/comstack/Makefile.in +++ b/comstack/Makefile.in @@ -74,12 +74,11 @@ INCLUDES = -I../include libcomstack_a_SOURCES = comstack.c tcpip.c waislen.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../include/yaz +DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/configure b/configure index c760de9..24b194a 100755 --- a/configure +++ b/configure @@ -779,13 +779,10 @@ else fi - - - # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:789: checking for $ac_word" >&5 +echo "configure:786: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -815,7 +812,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:819: checking for $ac_word" >&5 +echo "configure:816: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -866,7 +863,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:870: checking for $ac_word" >&5 +echo "configure:867: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -898,7 +895,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:902: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:899: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -909,12 +906,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 913 "configure" +#line 910 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -940,12 +937,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:944: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:941: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:949: checking whether we are using GNU C" >&5 +echo "configure:946: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -954,7 +951,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -973,7 +970,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:977: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:974: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1005,7 +1002,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1009: checking how to run the C preprocessor" >&5 +echo "configure:1006: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1020,13 +1017,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1027: \"$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 : @@ -1037,13 +1034,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1044: \"$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 : @@ -1054,13 +1051,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1061: \"$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 : @@ -1096,7 +1093,7 @@ echo "$ac_t""$CPP" 1>&6 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1100: checking for a BSD compatible install" >&5 +echo "configure:1097: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1151,7 +1148,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1155: checking for $ac_word" >&5 +echo "configure:1152: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1204,12 +1201,12 @@ else fi checkBoth=0 echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1208: 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 <&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 @@ -1253,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:1257: 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 @@ -1261,14 +1258,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: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 @@ -1294,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:1298: 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 <&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 @@ -1344,12 +1341,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1348: 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 <&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 @@ -1390,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:1394: 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 @@ -1398,14 +1395,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: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 @@ -1428,7 +1425,7 @@ fi fi echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:1432: 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 @@ -1436,7 +1433,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: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 @@ -1469,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:1473: 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 @@ -1477,7 +1474,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: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 @@ -1510,7 +1507,7 @@ fi fi echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6 -echo "configure:1514: 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 @@ -1518,7 +1515,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: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 @@ -1554,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:1558: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1568: \"$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* @@ -1599,11 +1596,11 @@ fi if test "$enable_tcpd" = "yes"; then echo $ac_n "checking for working tcpd.h""... $ac_c" 1>&6 -echo "configure:1603: 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 < #include @@ -1614,7 +1611,7 @@ struct request_info request_info; int i; i = hosts_access(&request_info); ; return 0; } EOF -if { (eval echo configure:1618: \"$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 @@ -1636,12 +1633,12 @@ EOF fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1640: 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 < #include @@ -1649,7 +1646,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1653: \"$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* @@ -1666,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 @@ -1684,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 @@ -1705,7 +1702,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1716,7 +1713,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1720: \"$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 @@ -1753,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:1757: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1767: \"$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* @@ -1790,12 +1787,12 @@ fi done echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6 -echo "configure:1794: 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 <&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 @@ -1839,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:1843: 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 @@ -1847,14 +1844,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: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 @@ -1952,7 +1949,19 @@ fi trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 -DEFS=-DHAVE_CONFIG_H +# Transform confdefs.h into DEFS. +# Protect against shell expansion while executing Makefile rules. +# Protect against Makefile macro expansion. +cat > conftest.defs <<\EOF +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g +s%\[%\\&%g +s%\]%\\&%g +s%\$%$$%g +EOF +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +rm -f conftest.defs + # Without the "./", some shells look in PATH for config.status. : ${CONFIG_STATUS=./config.status} @@ -1990,7 +1999,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile util/Makefile odr/Makefile z39.50/Makefile asn/Makefile ill/Makefile zutil/Makefile comstack/Makefile ccl/Makefile tab/Makefile retrieval/Makefile server/Makefile include/Makefile include/yaz/Makefile lib/Makefile client/Makefile ztest/Makefile doc/Makefile include/yaz/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile util/Makefile odr/Makefile z39.50/Makefile asn/Makefile ill/Makefile zutil/Makefile comstack/Makefile ccl/Makefile tab/Makefile retrieval/Makefile server/Makefile include/Makefile include/yaz/Makefile lib/Makefile client/Makefile ztest/Makefile doc/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -fi -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - echo creating $ac_file - - rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - cat $ac_file_inputs > conftest.in - -EOF - -# Transform confdefs.h into a sed script conftest.vals that substitutes -# the proper values into config.h.in to produce config.h. And first: -# Protect against being on the right side of a sed subst in config.status. -# Protect against being in an unquoted here document in config.status. -rm -f conftest.vals -cat > conftest.hdr <<\EOF -s/[\\&%]/\\&/g -s%[\\$`]%\\&%g -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp -s%ac_d%ac_u%gp -s%ac_u%ac_e%gp -EOF -sed -n -f conftest.hdr confdefs.h > conftest.vals -rm -f conftest.hdr - -# This sed command replaces #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -cat >> conftest.vals <<\EOF -s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% -EOF - -# Break up conftest.vals because some shells have a limit on -# the size of here documents, and old seds have small limits too. - -rm -f conftest.tail -while : -do - ac_lines=`grep -c . conftest.vals` - # grep -c gives empty output for an empty file on some AIX systems. - if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi - # Write a limited-size here document to conftest.frag. - echo ' cat > conftest.frag <> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS - echo 'CEOF - sed -f conftest.frag conftest.in > conftest.out - rm -f conftest.in - mv conftest.out conftest.in -' >> $CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail - rm -f conftest.vals - mv conftest.tail conftest.vals -done -rm -f conftest.vals - -cat >> $CONFIG_STATUS <<\EOF - rm -f conftest.frag conftest.h - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h - cat conftest.in >> conftest.h - rm -f conftest.in - if cmp -s $ac_file conftest.h 2>/dev/null; then - echo "$ac_file is unchanged" - rm -f conftest.h - else - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - fi - rm -f $ac_file - mv conftest.h $ac_file - fi -fi; done - EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -test -z "$CONFIG_HEADERS" || echo timestamp > include/yaz/stamp-h exit 0 EOF diff --git a/configure.in b/configure.in index d304be4..28d6879 100644 --- a/configure.in +++ b/configure.in @@ -1,10 +1,10 @@ dnl YAZ Toolkit dnl (c) Index Data 1994-2000 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.16 2000-02-28 11:20:05 adam Exp $ +dnl $Id: configure.in,v 1.17 2000-02-29 13:44:55 adam Exp $ AC_INIT(include/yaz/yaz-version.h) AM_INIT_AUTOMAKE(yaz, 1.6) -AM_CONFIG_HEADER(include/yaz/config.h) +dnl AM_CONFIG_HEADER(include/config.h) dnl dnl ------ Checking programs AC_PROG_CC diff --git a/doc/Makefile.am b/doc/Makefile.am index dbb5613..0a76a1a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.2 2000-02-28 11:44:39 adam Exp $ +## $Id: Makefile.am,v 1.3 2000-02-29 13:44:55 adam Exp $ docdir=$(pkgdatadir)/doc @@ -7,10 +7,10 @@ doc_DATA = \ yaz-1.html yaz-2.html yaz-3.html yaz-4.html yaz-5.html \ yaz-6.html yaz-7.html yaz-8.htlm yaz-9.html -#EXTRA_DIST = \ -# yaz.sgml yaz.txt yaz.ps profile.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.htlm yaz-9.html +EXTRA_DIST = \ + yaz.sgml yaz.txt yaz.ps profile.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.htlm yaz-9.html yaz.txt: yaz.sgml sgml2txt -f yaz.sgml diff --git a/doc/Makefile.in b/doc/Makefile.in index adebae0..3899769 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -72,8 +72,10 @@ docdir = $(pkgdatadir)/doc doc_DATA = yaz.sgml yaz.txt yaz.ps profile.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.htlm yaz-9.html + +EXTRA_DIST = yaz.sgml yaz.txt yaz.ps profile.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.htlm yaz-9.html + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = DATA = $(doc_DATA) @@ -198,11 +200,6 @@ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean -#EXTRA_DIST = \ -# yaz.sgml yaz.txt yaz.ps profile.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.htlm yaz-9.html - yaz.txt: yaz.sgml sgml2txt -f yaz.sgml diff --git a/ill/Makefile.in b/ill/Makefile.in index 046143d..f5d968a 100644 --- a/ill/Makefile.in +++ b/ill/Makefile.in @@ -76,12 +76,11 @@ noinst_LIBRARIES = libill.a libill_a_SOURCES = ill-core.c item-req.c ill-get.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../include/yaz +DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/include/Makefile.in b/include/Makefile.in index 7b23fc6..ab8bf8e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -72,7 +72,6 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = yaz mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = DIST_COMMON = Makefile.am Makefile.in diff --git a/include/yaz/Makefile.am b/include/yaz/Makefile.am index 901b520..790c73c 100644 --- a/include/yaz/Makefile.am +++ b/include/yaz/Makefile.am @@ -1,18 +1,18 @@ -## $Id: Makefile.am,v 1.3 2000-02-28 12:34:28 adam Exp $ +## $Id: Makefile.am,v 1.4 2000-02-29 13:44:55 adam Exp $ -pkginclude_HEADERS= backend.h ccl.h comstack.h config.h \ +pkginclude_HEADERS= backend.h ccl.h comstack.h \ d1_attset.h d1_map.h data1.h diagbib1.h \ ill.h log.h logrpn.h marcdisp.h nmem.h odr.h oid.h options.h otherinfo.h \ - pquery.h prt-acc.h prt-add.h prt-arc.h prt-dat.h prt-dia.h \ + pquery.h proto.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-ext.h prt-grs.h prt-proto.h prt-rsc.h \ prt-univ.h readconf.h statserv.h tcpip.h tpath.h wrbuf.h xmalloc.h \ - yaz-ccl.h yaz-util.h yaz-version.h yconfig.h z-accdes1.h z-accform1.h \ + yaz-ccl.h yaz-util.h yaz-version.h \ + yconfig.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 - EXTRA_HEADERS= proto.h ill-core.h itemreq.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 \ diff --git a/include/yaz/Makefile.in b/include/yaz/Makefile.in index 93bd9eb..69315ad 100644 --- a/include/yaz/Makefile.in +++ b/include/yaz/Makefile.in @@ -68,17 +68,16 @@ RANLIB = @RANLIB@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ -pkginclude_HEADERS = backend.h ccl.h comstack.h config.h d1_attset.h d1_map.h data1.h diagbib1.h ill.h log.h logrpn.h marcdisp.h nmem.h odr.h oid.h options.h otherinfo.h pquery.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-ext.h prt-grs.h prt-proto.h prt-rsc.h prt-univ.h readconf.h statserv.h tcpip.h tpath.h wrbuf.h xmalloc.h yaz-ccl.h yaz-util.h yaz-version.h yconfig.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 +pkginclude_HEADERS = backend.h ccl.h comstack.h d1_attset.h d1_map.h data1.h diagbib1.h ill.h log.h logrpn.h marcdisp.h nmem.h odr.h oid.h options.h otherinfo.h pquery.h proto.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-ext.h prt-grs.h prt-proto.h prt-rsc.h prt-univ.h readconf.h statserv.h tcpip.h tpath.h wrbuf.h xmalloc.h yaz-ccl.h yaz-util.h yaz-version.h yconfig.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 EXTRA_HEADERS = proto.h ill-core.h itemreq.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 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = HEADERS = $(pkginclude_HEADERS) -DIST_COMMON = ./stamp-h.in Makefile.am Makefile.in config.h.in +DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -95,34 +94,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -config.h: stamp-h - @if test ! -f $@; then \ - rm -f stamp-h; \ - $(MAKE) stamp-h; \ - else :; fi -stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=include/yaz/config.h \ - $(SHELL) ./config.status - @echo timestamp > stamp-h 2> /dev/null -$(srcdir)/config.h.in: $(srcdir)/stamp-h.in - @if test ! -f $@; then \ - rm -f $(srcdir)/stamp-h.in; \ - $(MAKE) $(srcdir)/stamp-h.in; \ - else :; fi -$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null - -mostlyclean-hdr: - -clean-hdr: - -distclean-hdr: - -rm -f config.h - -maintainer-clean-hdr: - install-pkgincludeHEADERS: $(pkginclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) @@ -148,15 +119,15 @@ ID: $(HEADERS) $(SOURCES) $(LISP) here=`pwd` && cd $(srcdir) \ && mkid -f$$here/ID $$unique $(LISP) -TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: @@ -195,9 +166,6 @@ check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am -all-recursive-am: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - install-exec-am: install-exec: install-exec-am @@ -209,7 +177,7 @@ install-am: all-am install: install-am uninstall-am: uninstall-pkgincludeHEADERS uninstall: uninstall-am -all-am: Makefile $(HEADERS) config.h +all-am: Makefile $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install @@ -226,34 +194,32 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic +mostlyclean-am: mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-am -clean-am: clean-hdr clean-tags clean-generic mostlyclean-am +clean-am: clean-tags clean-generic mostlyclean-am clean: clean-am -distclean-am: distclean-hdr distclean-tags distclean-generic clean-am +distclean-am: distclean-tags distclean-generic clean-am distclean: distclean-am -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ - maintainer-clean-generic distclean-am +maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -uninstall-pkgincludeHEADERS install-pkgincludeHEADERS tags \ +.PHONY: uninstall-pkgincludeHEADERS install-pkgincludeHEADERS tags \ mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ distdir info-am info dvi-am dvi check check-am installcheck-am \ -installcheck all-recursive-am install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +installcheck install-exec-am install-exec install-data-am install-data \ +install-am install uninstall-am uninstall all-redirect all-am all \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/include/yaz/config.h.in b/include/yaz/config.h.in deleted file mode 100644 index 8bccda9..0000000 --- a/include/yaz/config.h.in +++ /dev/null @@ -1,30 +0,0 @@ -/* include/yaz/config.h.in. Generated automatically from configure.in by autoheader. */ - -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS - -#undef _REENTRANT -#undef HAVE_TCPD_H -#undef HAVE_YC - -/* Define if you have the header file. */ -#undef HAVE_PTHREAD_H - -/* Define if you have the header file. */ -#undef HAVE_READLINE_HISTORY_H - -/* Define if you have the header file. */ -#undef HAVE_READLINE_READLINE_H - -/* Define if you have the header file. */ -#undef HAVE_THREADS_H - -/* Define if you have the pthread library (-lpthread). */ -#undef HAVE_LIBPTHREAD - -/* Name of package */ -#undef PACKAGE - -/* Version number of package */ -#undef VERSION - diff --git a/include/yaz/prt-ext.h b/include/yaz/prt-ext.h index 5d7f6be..0aab672 100644 --- a/include/yaz/prt-ext.h +++ b/include/yaz/prt-ext.h @@ -35,9 +35,8 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif + +YAZ_BEGIN_CDECL /* * Used to keep track of known External definitions (a loose approach @@ -104,13 +103,12 @@ struct Z_External } u; }; + YAZ_EXPORT int z_External(ODR o, Z_External **p, int opt, const char *name); YAZ_EXPORT Z_ext_typeent *z_ext_getentbyref(oid_value val); YAZ_EXPORT Z_External *z_ext_record(ODR o, int format, const char *buf, int len); -#ifdef __cplusplus -} -#endif +YAZ_END_CDECL #endif diff --git a/include/yaz/yconfig.h b/include/yaz/yconfig.h index 9d831f0..788ad9f 100644 --- a/include/yaz/yconfig.h +++ b/include/yaz/yconfig.h @@ -1,10 +1,6 @@ #ifndef YCONFIG_H #define YCONFIG_H -#if HAVE_CONFIG_H -#include -#endif - #ifndef YAZ_EXPORT # ifdef WIN32 # define YAZ_EXPORT __declspec(dllexport) diff --git a/lib/Makefile.in b/lib/Makefile.in index e3c6373..4b218b7 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -83,12 +83,11 @@ YAZLIBS = ../odr/libodr.a ../@ASNMODULE@/libasn.a ../comstack/libcomstack.a ../ LIBDIR = $(exec_prefix)/lib INCDIR = $(prefix)/include mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(lib_LIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../include/yaz +DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/odr/Makefile.in b/odr/Makefile.in index b3a0d66..9ce5438 100644 --- a/odr/Makefile.in +++ b/odr/Makefile.in @@ -75,12 +75,11 @@ INCLUDES = -I../include libodr_a_SOURCES = odr_bool.c ber_bool.c ber_len.c ber_tag.c odr_util.c odr_null.c ber_null.c odr_int.c ber_int.c odr_tag.c odr_cons.c odr_seq.c odr_oct.c ber_oct.c odr_bit.c ber_bit.c odr_oid.c ber_oid.c odr_use.c odr_choice.c odr_any.c ber_any.c odr.c odr_mem.c dumpber.c odr_enum.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../include/yaz +DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/odr/ber_any.c b/odr/ber_any.c index 39ebd25..9ca2cb2 100644 --- a/odr/ber_any.c +++ b/odr/ber_any.c @@ -3,7 +3,10 @@ * See the file LICENSE for details. * * $Log: ber_any.c,v $ - * Revision 1.17 2000-01-31 13:15:21 adam + * Revision 1.18 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.17 2000/01/31 13:15:21 adam * Removed uses of assert(3). Cleanup of ODR. CCL parser update so * that some characters are not surrounded by spaces in resulting term. * ILL-code updates. @@ -58,7 +61,9 @@ * Works better now. * */ - +#if HAVE_CONFIG_H +#include +#endif #include int ber_any(ODR o, Odr_any **p) diff --git a/odr/ber_bit.c b/odr/ber_bit.c index 7d84422..666d329 100644 --- a/odr/ber_bit.c +++ b/odr/ber_bit.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: ber_bit.c,v $ - * Revision 1.11 2000-01-31 13:15:21 adam + * Revision 1.12 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.11 2000/01/31 13:15:21 adam * Removed uses of assert(3). Cleanup of ODR. CCL parser update so * that some characters are not surrounded by spaces in resulting term. * ILL-code updates. @@ -43,6 +46,9 @@ * * */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/odr/ber_bool.c b/odr/ber_bool.c index ea7990b..d82ab47 100644 --- a/odr/ber_bool.c +++ b/odr/ber_bool.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: ber_bool.c,v $ - * Revision 1.10 2000-01-31 13:15:21 adam + * Revision 1.11 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.10 2000/01/31 13:15:21 adam * Removed uses of assert(3). Cleanup of ODR. CCL parser update so * that some characters are not surrounded by spaces in resulting term. * ILL-code updates. @@ -39,6 +42,10 @@ * */ +#if HAVE_CONFIG_H +#include +#endif + #include #include diff --git a/odr/ber_int.c b/odr/ber_int.c index abd0bc3..65ecc78 100644 --- a/odr/ber_int.c +++ b/odr/ber_int.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: ber_int.c,v $ - * Revision 1.17 2000-02-28 11:20:06 adam + * Revision 1.18 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.17 2000/02/28 11:20:06 adam * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL. * * Revision 1.16 2000/01/31 13:15:21 adam @@ -59,17 +62,20 @@ * First kick. * */ +#if HAVE_CONFIG_H +#include +#endif #include -#include - #ifdef WIN32 #include #else #include #endif +#include + static int ber_encinteger(ODR o, int val); static int ber_decinteger(const unsigned char *buf, int *val); diff --git a/odr/ber_len.c b/odr/ber_len.c index c9ff2fe..e57997a 100644 --- a/odr/ber_len.c +++ b/odr/ber_len.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1995-1999, Index Data. + * Copyright (C) 1995-2000, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: ber_len.c,v $ - * Revision 1.8 1999-11-30 13:47:11 adam + * Revision 1.9 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.8 1999/11/30 13:47:11 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.7 1999/01/08 11:23:23 adam @@ -21,6 +24,9 @@ * * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/odr/ber_null.c b/odr/ber_null.c index 6b8b749..0e9beeb 100644 --- a/odr/ber_null.c +++ b/odr/ber_null.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: ber_null.c,v $ - * Revision 1.10 2000-01-31 13:15:21 adam + * Revision 1.11 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.10 2000/01/31 13:15:21 adam * Removed uses of assert(3). Cleanup of ODR. CCL parser update so * that some characters are not surrounded by spaces in resulting term. * ILL-code updates. @@ -38,6 +41,9 @@ * First kick. * */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/odr/ber_oct.c b/odr/ber_oct.c index 9680424..898ad4d 100644 --- a/odr/ber_oct.c +++ b/odr/ber_oct.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: ber_oct.c,v $ - * Revision 1.15 2000-01-31 13:15:21 adam + * Revision 1.16 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.15 2000/01/31 13:15:21 adam * Removed uses of assert(3). Cleanup of ODR. CCL parser update so * that some characters are not surrounded by spaces in resulting term. * ILL-code updates. @@ -54,6 +57,9 @@ * First kick. * */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/odr/ber_oid.c b/odr/ber_oid.c index 3ecd59b..cf75c66 100644 --- a/odr/ber_oid.c +++ b/odr/ber_oid.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: ber_oid.c,v $ - * Revision 1.11 2000-01-31 13:15:21 adam + * Revision 1.12 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.11 2000/01/31 13:15:21 adam * Removed uses of assert(3). Cleanup of ODR. CCL parser update so * that some characters are not surrounded by spaces in resulting term. * ILL-code updates. @@ -41,6 +44,9 @@ * Initial revision * */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/odr/ber_tag.c b/odr/ber_tag.c index 0787d61..03b9c79 100644 --- a/odr/ber_tag.c +++ b/odr/ber_tag.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: ber_tag.c,v $ - * Revision 1.21 2000-01-31 13:15:21 adam + * Revision 1.22 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.21 2000/01/31 13:15:21 adam * Removed uses of assert(3). Cleanup of ODR. CCL parser update so * that some characters are not surrounded by spaces in resulting term. * ILL-code updates. @@ -73,6 +76,9 @@ * First kick. * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/odr/dumpber.c b/odr/dumpber.c index fa3734f..2ba5a70 100644 --- a/odr/dumpber.c +++ b/odr/dumpber.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data. + * Copyright (c) 1995-2000, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: dumpber.c,v $ - * Revision 1.11 1999-11-30 13:47:11 adam + * Revision 1.12 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.11 1999/11/30 13:47:11 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.10 1999/01/08 11:23:26 adam @@ -39,6 +42,9 @@ * * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/odr/odr.c b/odr/odr.c index 787b56e..86b8652 100644 --- a/odr/odr.c +++ b/odr/odr.c @@ -3,7 +3,10 @@ * See the file LICENSE for details. * * $Log: odr.c,v $ - * Revision 1.32 2000-01-31 13:15:21 adam + * Revision 1.33 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.32 2000/01/31 13:15:21 adam * Removed uses of assert(3). Cleanup of ODR. CCL parser update so * that some characters are not surrounded by spaces in resulting term. * ILL-code updates. @@ -110,6 +113,9 @@ * * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/odr/odr_any.c b/odr/odr_any.c index b5a1dcd..9331bf8 100644 --- a/odr/odr_any.c +++ b/odr/odr_any.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_any.c,v $ - * Revision 1.9 1999-11-30 13:47:11 adam + * Revision 1.10 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.9 1999/11/30 13:47:11 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.8 1999/04/20 09:56:48 adam @@ -33,6 +36,9 @@ * Works better now. * */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/odr/odr_bit.c b/odr/odr_bit.c index d744e54..9492b6e 100644 --- a/odr/odr_bit.c +++ b/odr/odr_bit.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_bit.c,v $ - * Revision 1.13 1999-11-30 13:47:11 adam + * Revision 1.14 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.13 1999/11/30 13:47:11 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.12 1999/04/20 09:56:48 adam @@ -46,6 +49,9 @@ * * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/odr/odr_bool.c b/odr/odr_bool.c index 51bb366..0ea96b4 100644 --- a/odr/odr_bool.c +++ b/odr/odr_bool.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_bool.c,v $ - * Revision 1.11 1999-11-30 13:47:11 adam + * Revision 1.12 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.11 1999/11/30 13:47:11 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.10 1999/04/20 09:56:48 adam @@ -39,6 +42,9 @@ * First kick. * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/odr/odr_choice.c b/odr/odr_choice.c index 81ceb84..622203b 100644 --- a/odr/odr_choice.c +++ b/odr/odr_choice.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_choice.c,v $ - * Revision 1.17 1999-11-30 13:47:11 adam + * Revision 1.18 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.17 1999/11/30 13:47:11 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.16 1999/04/20 09:56:48 adam @@ -58,6 +61,9 @@ * A damn mess, but now things work, I think. * */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/odr/odr_cons.c b/odr/odr_cons.c index e26a748..c74229c 100644 --- a/odr/odr_cons.c +++ b/odr/odr_cons.c @@ -3,7 +3,10 @@ * See the file LICENSE for details. * * $Log: odr_cons.c,v $ - * Revision 1.21 2000-01-31 13:15:21 adam + * Revision 1.22 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.21 2000/01/31 13:15:21 adam * Removed uses of assert(3). Cleanup of ODR. CCL parser update so * that some characters are not surrounded by spaces in resulting term. * ILL-code updates. @@ -71,6 +74,9 @@ * First kick. * */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/odr/odr_enum.c b/odr/odr_enum.c index f24f51a..5fcc29b 100644 --- a/odr/odr_enum.c +++ b/odr/odr_enum.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_enum.c,v $ - * Revision 1.4 1999-11-30 13:47:11 adam + * Revision 1.5 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.4 1999/11/30 13:47:11 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.3 1999/04/20 09:56:48 adam @@ -18,6 +21,9 @@ * Implemented odr_enum and odr_set_of. * */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/odr/odr_int.c b/odr/odr_int.c index 334609a..7d8f66c 100644 --- a/odr/odr_int.c +++ b/odr/odr_int.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_int.c,v $ - * Revision 1.14 1999-11-30 13:47:11 adam + * Revision 1.15 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.14 1999/11/30 13:47:11 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.13 1999/04/20 09:56:48 adam @@ -48,6 +51,9 @@ * First kick. * */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/odr/odr_mem.c b/odr/odr_mem.c index 02b78dc..d5d3193 100644 --- a/odr/odr_mem.c +++ b/odr/odr_mem.c @@ -3,7 +3,10 @@ * See the file LICENSE for details. * * $Log: odr_mem.c,v $ - * Revision 1.17 2000-01-31 13:15:21 adam + * Revision 1.18 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.17 2000/01/31 13:15:21 adam * Removed uses of assert(3). Cleanup of ODR. CCL parser update so * that some characters are not surrounded by spaces in resulting term. * ILL-code updates. @@ -59,6 +62,9 @@ * Beginning to add memory management to odr * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/odr/odr_null.c b/odr/odr_null.c index 35d6628..eb43bfe 100644 --- a/odr/odr_null.c +++ b/odr/odr_null.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_null.c,v $ - * Revision 1.12 1999-11-30 13:47:11 adam + * Revision 1.13 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.12 1999/11/30 13:47:11 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.11 1999/04/20 09:56:48 adam @@ -43,6 +46,9 @@ * First kick. * */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/odr/odr_oct.c b/odr/odr_oct.c index 4146c5b..7fd03f8 100644 --- a/odr/odr_oct.c +++ b/odr/odr_oct.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_oct.c,v $ - * Revision 1.15 1999-11-30 13:47:11 adam + * Revision 1.16 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.15 1999/11/30 13:47:11 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.14 1999/10/19 12:35:55 adam @@ -51,6 +54,9 @@ * First kick. * */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/odr/odr_oid.c b/odr/odr_oid.c index 70b8a16..7e7e1b8 100644 --- a/odr/odr_oid.c +++ b/odr/odr_oid.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_oid.c,v $ - * Revision 1.15 1999-11-30 13:47:11 adam + * Revision 1.16 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.15 1999/11/30 13:47:11 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.14 1999/04/20 09:56:48 adam @@ -52,6 +55,9 @@ * * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/odr/odr_seq.c b/odr/odr_seq.c index 17e9af2..4f3fa3b 100644 --- a/odr/odr_seq.c +++ b/odr/odr_seq.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_seq.c,v $ - * Revision 1.26 2000-01-31 13:15:21 adam + * Revision 1.27 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.26 2000/01/31 13:15:21 adam * Removed uses of assert(3). Cleanup of ODR. CCL parser update so * that some characters are not surrounded by spaces in resulting term. * ILL-code updates. @@ -89,6 +92,10 @@ * */ +#if HAVE_CONFIG_H +#include +#endif + #include int odr_sequence_begin(ODR o, void *p, int size, const char *name) diff --git a/odr/odr_tag.c b/odr/odr_tag.c index 543d529..19459c7 100644 --- a/odr/odr_tag.c +++ b/odr/odr_tag.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_tag.c,v $ - * Revision 1.10 1999-11-30 13:47:11 adam + * Revision 1.11 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.10 1999/11/30 13:47:11 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.9 1998/02/11 11:53:34 adam @@ -35,6 +38,9 @@ * First kick. * */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/odr/odr_use.c b/odr/odr_use.c index 2ac7ab2..99141d6 100644 --- a/odr/odr_use.c +++ b/odr/odr_use.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_use.c,v $ - * Revision 1.10 1999-11-30 13:47:12 adam + * Revision 1.11 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.10 1999/11/30 13:47:12 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.9 1999/04/20 09:56:48 adam @@ -36,6 +39,9 @@ * Initial revision * */ +#if HAVE_CONFIG_H +#include +#endif #include diff --git a/odr/odr_util.c b/odr/odr_util.c index 427c16a..1d35925 100644 --- a/odr/odr_util.c +++ b/odr/odr_util.c @@ -3,7 +3,10 @@ * See the file LICENSE for details. * * $Log: odr_util.c,v $ - * Revision 1.18 2000-01-31 13:15:21 adam + * Revision 1.19 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.18 2000/01/31 13:15:21 adam * Removed uses of assert(3). Cleanup of ODR. CCL parser update so * that some characters are not surrounded by spaces in resulting term. * ILL-code updates. @@ -30,6 +33,9 @@ * Bug fix: missing fclose in data1_read_espec1. * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/retrieval/Makefile.in b/retrieval/Makefile.in index 25d8dc1..4ad61d4 100644 --- a/retrieval/Makefile.in +++ b/retrieval/Makefile.in @@ -75,12 +75,11 @@ libret_a_SOURCES = d1_handle.c d1_read.c d1_attset.c d1_tagset.c d1_absyn.c d1 INCLUDES = -I../include mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../include/yaz +DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/server/Makefile.in b/server/Makefile.in index 0aaea59..0860c3b 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -79,12 +79,11 @@ INCLUDES = -I../include LDADD = ../lib/libyaz.a mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../include/yaz +DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/tab/Makefile.in b/tab/Makefile.in index 1c282f1..7427367 100644 --- a/tab/Makefile.in +++ b/tab/Makefile.in @@ -75,7 +75,6 @@ tabdata_DATA = bib1.att dan1.att danmarc.abs explain.abs explain.att explain.ta EXTRA_DIST = 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 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = DATA = $(tabdata_DATA) diff --git a/util/Makefile.am b/util/Makefile.am index 11ed0d6..c67abbb 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,10 +1,11 @@ ## Copyright (C) 1994-2000, Index Data ## All rights reserved. -## $Id: Makefile.am,v 1.2 2000-02-28 11:44:39 adam Exp $ +## $Id: Makefile.am,v 1.3 2000-02-29 13:44:55 adam Exp $ noinst_LIBRARIES = libutil.a EXTRA_DIST=yc.tcl -INCLUDES=-I../include +INCLUDES=-I../include + libutil_a_SOURCES=options.c log.c marcdisp.c oid.c wrbuf.c nmemsdup.c \ xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c diff --git a/util/Makefile.in b/util/Makefile.in index e0edef0..99cd311 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -71,16 +71,16 @@ VERSION = @VERSION@ noinst_LIBRARIES = libutil.a EXTRA_DIST = yc.tcl -INCLUDES = -I../include +INCLUDES = -I../include + libutil_a_SOURCES = options.c log.c marcdisp.c oid.c wrbuf.c nmemsdup.c xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../include/yaz +DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/util/atoin.c b/util/atoin.c index 9ff7865..3b5953a 100644 --- a/util/atoin.c +++ b/util/atoin.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: atoin.c,v $ - * Revision 1.2 1999-11-30 13:47:12 adam + * Revision 1.3 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.2 1999/11/30 13:47:12 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.1 1997/09/04 07:52:27 adam @@ -12,6 +15,10 @@ * */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/util/log.c b/util/log.c index 247a09b..b2b8c0d 100644 --- a/util/log.c +++ b/util/log.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: log.c,v $ - * Revision 1.21 2000-02-28 11:20:06 adam + * Revision 1.22 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.21 2000/02/28 11:20:06 adam * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL. * * Revision 1.20 1999/11/30 13:47:12 adam @@ -99,6 +102,10 @@ * */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/util/marcdisp.c b/util/marcdisp.c index ad67e22..ecbd86c 100644 --- a/util/marcdisp.c +++ b/util/marcdisp.c @@ -3,7 +3,10 @@ * See the file LICENSE for details. * * $Log: marcdisp.c,v $ - * Revision 1.10 2000-02-05 10:47:19 adam + * Revision 1.11 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.10 2000/02/05 10:47:19 adam * Identifier-length and indicator-lenght no longer set to 2 (forced). * * Revision 1.9 1999/12/21 16:24:48 adam @@ -35,6 +38,10 @@ * */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/util/marcdump.c b/util/marcdump.c index b28a838..37c9546 100644 --- a/util/marcdump.c +++ b/util/marcdump.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1997, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: marcdump.c,v $ - * Revision 1.9 1999-11-30 13:47:12 adam + * Revision 1.10 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.9 1999/11/30 13:47:12 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.8 1999/05/26 07:49:35 adam @@ -33,6 +36,10 @@ * */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/util/matchstr.c b/util/matchstr.c index 9be7145..0863781 100644 --- a/util/matchstr.c +++ b/util/matchstr.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1997, Index Data. + * Copyright (c) 1995-2000, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: matchstr.c,v $ - * Revision 1.4 1999-11-30 13:47:12 adam + * Revision 1.5 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.4 1999/11/30 13:47:12 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.3 1999/10/19 12:35:42 adam @@ -43,6 +46,10 @@ * * */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/util/nmem.c b/util/nmem.c index 3dd212a..59e2282 100644 --- a/util/nmem.c +++ b/util/nmem.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data. + * Copyright (c) 1995-2000, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: nmem.c,v $ - * Revision 1.20 2000-01-06 14:59:13 adam + * Revision 1.21 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.20 2000/01/06 14:59:13 adam * Added oid_init/oid_exit. Changed oid_exit. * * Revision 1.19 1999/11/30 13:47:12 adam @@ -77,6 +80,9 @@ * This is a simple and fairly wasteful little module for nibble memory * allocation. Evemtually we'll put in something better. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/util/nmemsdup.c b/util/nmemsdup.c index d33caf9..77ae6d7 100644 --- a/util/nmemsdup.c +++ b/util/nmemsdup.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1997, Index Data. + * Copyright (c) 1997-2000, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: nmemsdup.c,v $ - * Revision 1.3 1999-11-30 13:47:12 adam + * Revision 1.4 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.3 1999/11/30 13:47:12 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.2 1998/02/11 11:53:36 adam @@ -14,6 +17,9 @@ * YAZ version 1.4. * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/util/oid.c b/util/oid.c index c89e937..16a6d82 100644 --- a/util/oid.c +++ b/util/oid.c @@ -3,7 +3,10 @@ * See the file LICENSE for details. * * $Log: oid.c,v $ - * Revision 1.41 2000-01-10 15:16:53 adam + * Revision 1.42 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.41 2000/01/10 15:16:53 adam * Added several OID's. * * Revision 1.40 2000/01/06 14:59:13 adam @@ -155,6 +158,9 @@ * We could (and should?) extend this so that the user app can add new * entries to the list at initialization. */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/util/options.c b/util/options.c index 5c7f294..591a329 100644 --- a/util/options.c +++ b/util/options.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: options.c,v $ - * Revision 1.7 1999-11-30 13:47:12 adam + * Revision 1.8 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.7 1999/11/30 13:47:12 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.6 1997/09/01 08:54:13 adam @@ -34,6 +37,10 @@ * The first utility modules. * */ +#if HAVE_CONFIG_H +#include +#endif + #include #include diff --git a/util/readconf.c b/util/readconf.c index 429d70e..ce28536 100644 --- a/util/readconf.c +++ b/util/readconf.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1999, Index Data + * Copyright (C) 1994-2000, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: readconf.c,v $ - * Revision 1.9 1999-11-30 13:47:12 adam + * Revision 1.10 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.9 1999/11/30 13:47:12 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.8 1999/08/27 09:40:32 adam @@ -45,6 +48,9 @@ * * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/util/tpath.c b/util/tpath.c index 03dd264..380ed25 100644 --- a/util/tpath.c +++ b/util/tpath.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-2000, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: tpath.c,v $ - * Revision 1.3 1999-11-30 13:47:12 adam + * Revision 1.4 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.3 1999/11/30 13:47:12 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.2 1996/10/29 13:36:26 adam @@ -15,6 +18,9 @@ * * */ +#if HAVE_CONFIG_H +#include +#endif #include #include diff --git a/util/wrbuf.c b/util/wrbuf.c index b3b4b8b..d6d44a1 100644 --- a/util/wrbuf.c +++ b/util/wrbuf.c @@ -1,10 +1,13 @@ /* - * Copyright (c) 1995-1999, Index Data. + * Copyright (c) 1995-2000, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: wrbuf.c,v $ - * Revision 1.8 1999-11-30 13:47:12 adam + * Revision 1.9 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.8 1999/11/30 13:47:12 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.7 1999/11/03 09:05:56 adam @@ -35,6 +38,10 @@ * Growing buffer for writing various stuff. */ +#if HAVE_CONFIG_H +#include +#endif + #include #include diff --git a/util/xmalloc.c b/util/xmalloc.c index b5bccd2..390dc6d 100644 --- a/util/xmalloc.c +++ b/util/xmalloc.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1999, Index Data + * Copyright (C) 1994-2000, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: xmalloc.c,v $ - * Revision 1.10 1999-11-30 13:47:12 adam + * Revision 1.11 2000-02-29 13:44:55 adam + * Check for config.h (currently not generated). + * + * Revision 1.10 1999/11/30 13:47:12 adam * Improved installation. Moved header files to include/yaz. * * Revision 1.9 1999/09/10 08:58:32 adam @@ -56,6 +59,10 @@ * */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/yaz.spec b/yaz.spec index 8e5e7f1..fdf8c6c 100644 --- a/yaz.spec +++ b/yaz.spec @@ -21,12 +21,12 @@ Retrieval. %build CFLAGS="$RPM_OPT_FLAGS" \ - ./configure --prefix=$RPM_BUILD_ROOT/usr --enable-yc --enable-tcpd + ./configure --prefix=/usr --enable-yc --enable-tcpd make CFLAGS="$RPM_OPT_FLAGS" %install rm -fr $RPM_BUILD_ROOT -make install +make prefix=$RPM_BUILD_ROOT/usr install %files %defattr(-,root,root) diff --git a/z39.50/Makefile.in b/z39.50/Makefile.in index 7b907e6..49bd6b7 100644 --- a/z39.50/Makefile.in +++ b/z39.50/Makefile.in @@ -77,12 +77,11 @@ EXTRA_DIST = datetime.asn esupdate.asn univres.asn z3950v3.asn z.tcl libasn_a_SOURCES = z-accdes1.c z-accform1.c z-acckrb1.c z-core.c z-diag1.c z-espec1.c z-estask.c z-exp.c z-grs.c z-opac.c z-uifr1.c z-rrf1.c z-rrf2.c z-sum.c z-sutrs.c zes-expi.c zes-exps.c zes-order.c zes-pquery.c zes-psched.c zes-pset.c zes-update0.c z-date.c z-univ.c zes-update.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../include/yaz +DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/ztest/Makefile.in b/ztest/Makefile.in index 9286a97..61e650f 100644 --- a/ztest/Makefile.in +++ b/ztest/Makefile.in @@ -78,12 +78,11 @@ INCLUDES = -I../include LDADD = ../lib/libyaz.a mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = PROGRAMS = $(bin_PROGRAMS) -DEFS = @DEFS@ -I. -I$(srcdir) -I../include/yaz +DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/zutil/Makefile.in b/zutil/Makefile.in index 3a077d7..6e51ad4 100644 --- a/zutil/Makefile.in +++ b/zutil/Makefile.in @@ -75,12 +75,11 @@ INCLUDES = -I../include libzutil_a_SOURCES = zget.c prt-ext.c yaz-ccl.c diagbib1.c logrpn.c otherinfo.c pquery.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../include/yaz/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I../include/yaz +DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -- 1.7.10.4