From 7282236bf8f7f5ed9890f04c2b658397fd333e8b Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 2 Oct 2000 12:31:43 +0000 Subject: [PATCH] File yaz-config generated by configure (not Makefile). --- Makefile.am | 14 +------------- Makefile.in | 23 ++++++----------------- asn/Makefile.in | 1 + ccl/Makefile.in | 1 + client/Makefile.in | 1 + comstack/Makefile.in | 1 + configure | 7 ++++++- configure.in | 8 ++++++-- doc/Makefile.in | 1 + ill/Makefile.in | 1 + include/Makefile.in | 1 + include/yaz/Makefile.in | 1 + lib/Makefile.in | 1 + lib/yaz-config.in | 28 ++++++++++++++-------------- odr/Makefile.in | 1 + retrieval/Makefile.in | 1 + server/Makefile.in | 1 + tab/Makefile.in | 1 + util/Makefile.in | 1 + yaz-config.in | 7 +++++++ z39.50/Makefile.in | 1 + ztest/Makefile.in | 1 + zutil/Makefile.in | 1 + 23 files changed, 57 insertions(+), 47 deletions(-) create mode 100644 yaz-config.in diff --git a/Makefile.am b/Makefile.am index 15c7323..a31690c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.8 2000-06-19 09:49:35 adam Exp $ +## $Id: Makefile.am,v 1.9 2000-10-02 12:31:43 adam Exp $ AUTOMAKE_OPTIONS = foreign @@ -6,21 +6,9 @@ DIST_SUBDIRS=util odr z39.50 asn ill zutil comstack ccl tab retrieval server lib SUBDIRS = @SUBDIRS_VAR@ -noinst_SCRIPTS = yaz-config SPEC_FILE=$(PACKAGE).spec EXTRA_DIST=$(SPEC_FILE) README LICENSE CHANGELOG TODO windows.txt -yaz-config: Makefile - @rm -f yaz-config - @echo "#!/bin/sh" >yaz-config - @echo "# yaz-config for source tree" >>yaz-config - @echo "YAZVERSION=@VERSION@" >>yaz-config - @echo "YAZBIN=\"`pwd`/bin\"" >>yaz-config - @echo "YAZTAB=\"`pwd`/tab\"" >>yaz-config - @echo "YAZLIB=\"-L`pwd`/lib/.libs -lyaz @LIBS@\"" >>yaz-config - @echo "YAZINC=\"-I`pwd`/include\"" >>yaz-config - chmod +x yaz-config - dist-hook: cd doc; make mkdir $(distdir)/win diff --git a/Makefile.in b/Makefile.in index 883a3f4..30ac8ad 100644 --- a/Makefile.in +++ b/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ AUTOMAKE_OPTIONS = foreign @@ -84,17 +85,14 @@ DIST_SUBDIRS = util odr z39.50 asn ill zutil comstack ccl tab retrieval server l SUBDIRS = @SUBDIRS_VAR@ -noinst_SCRIPTS = yaz-config 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_CLEAN_FILES = -SCRIPTS = $(noinst_SCRIPTS) - +CONFIG_CLEAN_FILES = yaz-config DIST_COMMON = README Makefile.am Makefile.in TODO aclocal.m4 \ config.guess config.sub configure configure.in install-sh ltconfig \ -ltmain.sh missing mkinstalldirs +ltmain.sh missing mkinstalldirs yaz-config.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -117,6 +115,8 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) +yaz-config: $(top_builddir)/config.status yaz-config.in + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -290,7 +290,7 @@ install-am: all-am install: install-recursive uninstall-am: uninstall: uninstall-recursive -all-am: Makefile $(SCRIPTS) +all-am: Makefile all-redirect: all-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install @@ -343,17 +343,6 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean -yaz-config: Makefile - @rm -f yaz-config - @echo "#!/bin/sh" >yaz-config - @echo "# yaz-config for source tree" >>yaz-config - @echo "YAZVERSION=@VERSION@" >>yaz-config - @echo "YAZBIN=\"`pwd`/bin\"" >>yaz-config - @echo "YAZTAB=\"`pwd`/tab\"" >>yaz-config - @echo "YAZLIB=\"-L`pwd`/lib/.libs -lyaz @LIBS@\"" >>yaz-config - @echo "YAZINC=\"-I`pwd`/include\"" >>yaz-config - chmod +x yaz-config - dist-hook: cd doc; make mkdir $(distdir)/win diff --git a/asn/Makefile.in b/asn/Makefile.in index ddf953b..f7de461 100644 --- a/asn/Makefile.in +++ b/asn/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ noinst_LTLIBRARIES = libasn.la diff --git a/ccl/Makefile.in b/ccl/Makefile.in index f162eb8..82debb6 100644 --- a/ccl/Makefile.in +++ b/ccl/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ noinst_LTLIBRARIES = libccl.la diff --git a/client/Makefile.in b/client/Makefile.in index 00ba02f..745fe64 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ bin_PROGRAMS = yaz-client diff --git a/comstack/Makefile.in b/comstack/Makefile.in index ef2f116..617bfaa 100644 --- a/comstack/Makefile.in +++ b/comstack/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ noinst_LTLIBRARIES = libcomstack.la diff --git a/configure b/configure index b61b06f..3c3b970 100755 --- a/configure +++ b/configure @@ -2337,6 +2337,8 @@ EOF echo "$ac_t""no" 1>&6 fi fi + +YAZ_SRC_ROOT=`pwd` SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest" trap '' 1 2 15 @@ -2471,6 +2473,7 @@ lib/Makefile client/Makefile ztest/Makefile doc/Makefile +yaz-config lib/yaz-config" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF @@ -2659,7 +2664,7 @@ cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -chmod +x lib/yaz-config +chmod +x lib/yaz-config yaz-config exit 0 EOF chmod +x $CONFIG_STATUS diff --git a/configure.in b/configure.in index 4765bc8..008c61d 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl YAZ Toolkit, Index Data 1994-2000 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.32 2000-09-14 12:05:08 adam Exp $ +dnl $Id: configure.in,v 1.33 2000-10-02 12:31:43 adam Exp $ AC_INIT(include/yaz/yaz-version.h) AM_INIT_AUTOMAKE(yaz, 1.7) dnl @@ -118,6 +118,9 @@ if test "$enable_threads" = "yes"; then AC_MSG_RESULT(no) fi fi +dnl ------ Using this for "in-source" yaz-config +AC_SUBST(YAZ_SRC_ROOT) +YAZ_SRC_ROOT=`pwd` dnl SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest" AC_SUBST(SUBDIRS_VAR) @@ -143,4 +146,5 @@ lib/Makefile client/Makefile ztest/Makefile doc/Makefile -lib/yaz-config],[chmod +x lib/yaz-config]) +yaz-config +lib/yaz-config],[chmod +x lib/yaz-config yaz-config]) diff --git a/doc/Makefile.in b/doc/Makefile.in index 679a1ca..41aafda 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ docdir = $(pkgdatadir)/doc diff --git a/ill/Makefile.in b/ill/Makefile.in index c866d9c..5d6e0c9 100644 --- a/ill/Makefile.in +++ b/ill/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ INCLUDES = -I$(srcdir)/../include diff --git a/include/Makefile.in b/include/Makefile.in index 73ce914..995b628 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ AUTOMAKE_OPTIONS = foreign diff --git a/include/yaz/Makefile.in b/include/yaz/Makefile.in index 85b811e..6bdcb50 100644 --- a/include/yaz/Makefile.in +++ b/include/yaz/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ 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-admin.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 8c85394..c7d41b0 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ lib_LTLIBRARIES = libyaz.la diff --git a/lib/yaz-config.in b/lib/yaz-config.in index 15abac9..c215aee 100755 --- a/lib/yaz-config.in +++ b/lib/yaz-config.in @@ -1,10 +1,10 @@ #!/bin/sh -# $Id: yaz-config.in,v 1.5 2000-08-04 10:40:45 adam Exp $ +# $Id: yaz-config.in,v 1.6 2000-10-02 12:31:43 adam Exp $ yazprefix=@prefix@ -echo_cflags=no -echo_libs=no -echo_help=no -echo_tabs=no +yaz_echo_cflags=no +yaz_echo_libs=no +yaz_echo_help=no +yaz_echo_tabs=no yazlibs="@LIBS@" YAZVERSION=@VERSION@ @@ -24,7 +24,7 @@ EOF } #if test $# -eq 0; then -# echo_help=yes +# yaz_echo_help=yes #fi while test $# -gt 0; do @@ -46,16 +46,16 @@ while test $# -gt 0; do exit 0 ;; --cflags) - echo_cflags=yes + yaz_echo_cflags=yes ;; --libs) - echo_libs=yes + yaz_echo_libs=yes ;; --tabs) - echo_tabs=yes + yaz_echo_tabs=yes ;; -*) - echo_help=yes + yaz_echo_help=yes ;; esac shift @@ -75,15 +75,15 @@ else YAZINC=-I$yazprefix/include fi -if test "$echo_help" = "yes"; then +if test "$yaz_echo_help" = "yes"; then usage 1 1>&2 fi -if test "$echo_cflags" = "yes"; then +if test "$yaz_echo_cflags" = "yes"; then echo $YAZINC fi -if test "$echo_libs" = "yes"; then +if test "$yaz_echo_libs" = "yes"; then echo $YAZLIB fi -if test "$echo_tabs" = "yes"; then +if test "$yaz_echo_tabs" = "yes"; then echo $YAZTAB fi diff --git a/odr/Makefile.in b/odr/Makefile.in index e02b170..7a573d7 100644 --- a/odr/Makefile.in +++ b/odr/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ noinst_LTLIBRARIES = libodr.la diff --git a/retrieval/Makefile.in b/retrieval/Makefile.in index 9e21f57..d91215b 100644 --- a/retrieval/Makefile.in +++ b/retrieval/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ noinst_LTLIBRARIES = libret.la diff --git a/server/Makefile.in b/server/Makefile.in index 30f4359..a1e4815 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ noinst_LTLIBRARIES = libserver.la diff --git a/tab/Makefile.in b/tab/Makefile.in index 3eec835..b3b32b4 100644 --- a/tab/Makefile.in +++ b/tab/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ tabdatadir = $(pkgdatadir)/tab tabdata_DATA = bib1.att dan1.att danmarc.abs danmarc.mar 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 0324485..ad776e5 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ noinst_LTLIBRARIES = libutil.la diff --git a/yaz-config.in b/yaz-config.in new file mode 100644 index 0000000..70241cb --- /dev/null +++ b/yaz-config.in @@ -0,0 +1,7 @@ +#!/bin/sh +# yaz-config for source tree +YAZVERSION=@VERSION@ +YAZBIN="@YAZ_SRC_ROOT@/bin" +YAZTAB="@YAZ_SRC_ROOT@/tab" +YAZLIB="-L@YAZ_SRC_ROOT@/lib/.libs -lyaz" +YAZINC="-I@YAZ_SRC_ROOT@/include" diff --git a/z39.50/Makefile.in b/z39.50/Makefile.in index 96d9d1c..3f3cc0a 100644 --- a/z39.50/Makefile.in +++ b/z39.50/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ INCLUDES = -I$(srcdir)/../include diff --git a/ztest/Makefile.in b/ztest/Makefile.in index 391b339..2b95d02 100644 --- a/ztest/Makefile.in +++ b/ztest/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ bin_PROGRAMS = yaz-ztest diff --git a/zutil/Makefile.in b/zutil/Makefile.in index fdaabf5..317435c 100644 --- a/zutil/Makefile.in +++ b/zutil/Makefile.in @@ -77,6 +77,7 @@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ +YAZ_SRC_ROOT = @YAZ_SRC_ROOT@ noinst_LTLIBRARIES = libzutil.la -- 1.7.10.4