From 27e67487d8100738feb98ae7315540846d6bfdf0 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Sun, 2 Jun 2002 21:34:45 +0000 Subject: [PATCH] Remove --enable-module option --- Makefile.am | 4 ++-- client/client.c | 19 +------------------ configure.in | 25 +------------------------ lib/Makefile.am | 5 +++-- win/makefile | 11 ++++++----- 5 files changed, 13 insertions(+), 51 deletions(-) diff --git a/Makefile.am b/Makefile.am index ec09583..7c8b583 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ -## $Id: Makefile.am,v 1.13 2002-03-23 20:09:52 adam Exp $ +## $Id: Makefile.am,v 1.14 2002-06-02 21:34:45 adam Exp $ AUTOMAKE_OPTIONS = foreign DIST_SUBDIRS=util odr z39.50 ill zutil comstack ccl tab retrieval server lib zoom include client ztest doc -SUBDIRS = @SUBDIRS_VAR@ +SUBDIRS = util odr comstack z39.50 ill zutil ccl zoom tab retrieval server include lib client ztest aclocaldir=$(datadir)/aclocal diff --git a/client/client.c b/client/client.c index 84120e6..0c67a87 100644 --- a/client/client.c +++ b/client/client.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2002, Index Data * See the file LICENSE for details. * - * $Id: client.c,v 1.155 2002-06-02 21:29:30 adam Exp $ + * $Id: client.c,v 1.156 2002-06-02 21:34:45 adam Exp $ */ #include @@ -25,13 +25,9 @@ #include #include -#if YAZ_MODULE_ill #include -#endif -#if YAZ_MODULE_ccl #include -#endif #if HAVE_READLINE_READLINE_H #include @@ -88,9 +84,7 @@ typedef enum { static QueryType queryType = QueryType_Prefix; -#if YAZ_MODULE_ccl static CCL_bibset bibset; /* CCL bibset handle */ -#endif #if HAVE_READLINE_COMPLETION_OVER @@ -790,15 +784,12 @@ static int send_searchRequest(char *arg) Z_SearchRequest *req = apdu->u.searchRequest; Z_Query query; int oid[OID_SIZE]; -#if YAZ_MODULE_ccl struct ccl_rpn_node *rpn = NULL; int error, pos; -#endif char setstring[100]; Z_RPNQuery *RPNquery; Odr_oct ccl_query; -#if YAZ_MODULE_ccl if (queryType == QueryType_CCL2RPN) { rpn = ccl_find_str(bibset, arg, &error, &pos); @@ -808,7 +799,6 @@ static int send_searchRequest(char *arg) return 0; } } -#endif req->referenceId = set_refid (out); if (!strcmp(arg, "@big")) /* strictly for troublemaking */ { @@ -866,7 +856,6 @@ static int send_searchRequest(char *arg) ccl_query.buf = (unsigned char*) arg; ccl_query.len = strlen(arg); break; -#if YAZ_MODULE_ccl case QueryType_CCL2RPN: query.which = Z_Query_type_1; RPNquery = ccl_rpn_query(out, rpn); @@ -878,7 +867,6 @@ static int send_searchRequest(char *arg) query.u.type_1 = RPNquery; ccl_rpn_delete (rpn); break; -#endif default: printf ("Unsupported query type\n"); return 0; @@ -1191,8 +1179,6 @@ void process_ESResponse(Z_ExtendedServicesResponse *res) } } -#if YAZ_MODULE_ill - const char *get_ill_element (void *clientData, const char *element) { return 0; @@ -1254,9 +1240,7 @@ static Z_External *create_external_itemRequest() } return r; } -#endif -#ifdef YAZ_MODULE_ill static Z_External *create_external_ILL_APDU(int which) { struct ill_get_ctl ctl; @@ -1312,7 +1296,6 @@ static Z_External *create_external_ILL_APDU(int which) } return r; } -#endif static Z_External *create_ItemOrderExternal(const char *type, int itemno) diff --git a/configure.in b/configure.in index 766ee91..bd8e2e8 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl YAZ Toolkit, Index Data 1994-2001 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.75 2002-05-22 14:27:17 adam Exp $ +dnl $Id: configure.in,v 1.76 2002-06-02 21:34:45 adam Exp $ AC_INIT(include/yaz/yaz-version.h) AM_INIT_AUTOMAKE(yaz, 1.8.8dev) dnl @@ -60,27 +60,6 @@ AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] Use DSSSL in DIR/{html,print}/docbo fi ]) dnl -dnl ----- yaz-comp: The Yaz Compiler -AC_SUBST(EXTRAMODULE) -AC_SUBST(EXTRALIB) - -EXTRAMODULE="z39.50 zutil" - -AC_ARG_ENABLE(modules,[ --enable-modules=\"mod ..\" ill],[ -if test "$enable_modules" != "no"; then - EXTRAMODULE="$EXTRAMODULE $enable_modules" -fi -],[ -EXTRAMODULE="$EXTRAMODULE ill ccl zoom" -]) -EXTRALIB="" -for module in $EXTRAMODULE; do - EXTRALIB="$EXTRALIB ../$module/lib${module}.la" - if test $module = "z39.50"; then - module=z3950 - fi - AC_DEFINE_UNQUOTED(YAZ_MODULE_${module}) -done dnl ----- Sockets checkBoth=0 AC_CHECK_FUNC(connect) @@ -307,8 +286,6 @@ if test -f ${srcdir}/lib/yaz-config.in; then fi sed s%yaz_echo_source=yes%yaz_echo_source=no%g < ${srcdir}/yaz-config.in >${srcdir}/lib/yaz-config.in dnl -SUBDIRS_VAR="util odr comstack $EXTRAMODULE tab retrieval server include lib client ztest" -AC_SUBST(SUBDIRS_VAR) dnl ------ Makefiles dnl AC_OUTPUT([ diff --git a/lib/Makefile.am b/lib/Makefile.am index 8bc4d69..94c371e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.21 2002-03-22 23:44:55 adam Exp $ +## $Id: Makefile.am,v 1.22 2002-06-02 21:34:45 adam Exp $ if ISTHR extra=libyazthread.la @@ -75,5 +75,6 @@ tcpip.o: $(top_srcdir)/comstack/tcpip.c libyaz_la_LIBADD=../odr/libodr.la \ ../comstack/libcomstack.la ../server/libserver.la \ ../util/libutil.la ../retrieval/libret.la \ - $(EXTRALIB) + ../ccl/libccl.la ../zutil/libzutil.la \ + ../zoom/libzoom.la ../ill/libill.la ../z39.50/libz39.50.la diff --git a/win/makefile b/win/makefile index 0afc9f9..737ac54 100644 --- a/win/makefile +++ b/win/makefile @@ -1,5 +1,5 @@ # makefile.mak - makefile for MS NMAKE -# $Id: makefile,v 1.39 2002-05-31 08:48:06 adam Exp $ +# $Id: makefile,v 1.40 2002-06-02 21:34:45 adam Exp $ # # Programmed by # HL: Heikki Levanto, Index Data @@ -23,7 +23,7 @@ ############### Parameters ########################################################### -DEBUG=1 # 0 for release, 1 for debug +DEBUG=0 # 0 for release, 1 for debug default: all @@ -112,8 +112,6 @@ zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \ COMMON_C_OPTIONS= \ /nologo /W3 /GX /FD /c \ - /D "YAZ_MODULE_ill=1" \ - /D "YAZ_MODULE_ccl=1" \ /D "_WINDOWS" \ /D "WIN32" \ /FR"$(OBJDIR)\\" \ @@ -835,7 +833,10 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES) ########################################################### # # $Log: makefile,v $ -# Revision 1.39 2002-05-31 08:48:06 adam +# Revision 1.40 2002-06-02 21:34:45 adam +# Remove --enable-module option +# +# Revision 1.39 2002/05/31 08:48:06 adam # Changed SectionIns for NSIS v1.98 # # Revision 1.38 2002/05/18 09:52:37 oleg -- 1.7.10.4