Changeset 1937

Timestamp:

2001-02-09T14:59:29+13:00 (23 years ago)

Author:

jrm21

Message:

z39.50 support is now disabled by default, enabled by configure script.

Location:

trunk/gsdl/src/recpt

Files:

• Makefile.in (modified) (8 diffs)
• librarymain.cpp (modified) (5 diffs)

trunk/gsdl/src/recpt/Makefile.in

@@ -25 +25 @@
 ###########################################################################
 
+USE_Z3950 = @USE_Z3950@
+ifeq ($(USE_Z3950), 1)
+Z_CFLAGS=-DUSE_Z3950
+else
+Z_CFLAGS=
+endif
+
 AR = ar
 CC = @CC@
 CPP = @CXX@
 #CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual
-CCFLAGS = @CFLAGS@
+
+CCFLAGS = $(Z_CFLAGS) @CFLAGS@
 
 # YAZ kit for z39.50
@@ -128 +136 @@
 RECPTSOURCES = recptmain.cpp
 
-LIBRARYSOURCES = nullproto.cpp z3950proto.cpp z3950server.cpp librarymain.cpp \
-        zparse.tab.c parse.yy.c $(YAZDIR)/client/yaz_zclient.c
+ifeq ($(USE_Z3950), 1)
+Z_LIBSOURCES=z3950proto.cpp z3950server.cpp zparse.tab.c parse.yy.c $(YAZDIR)/client/yaz_zclient.c
+else
+Z_LIBSOURCES=
+endif
+
+LIBRARYSOURCES = nullproto.cpp librarymain.cpp $(Z_LIBSOURCES)
 
 SOURCES = $(COMMONSOURCES) $(RECPTSOURCES) $(LIBRARYSOURCES)
 
+
+ifeq ($(USE_Z3950), 1)
+Z_COMOBJS=parse.yy.o
+else
+Z_COMOBJS=
+endif
 
 COMMONOBJECTS = receptionist.o cgiwrapper.o cgiargs.o action.o browserclass.o \
@@ -143 +162 @@
         hlistbrowserclass.o datelistbrowserclass.o invbrowserclass.o \
         pagedbrowserclass.o htmlbrowserclass.o phindbrowserclass.o \
-        historydb.o parse.yy.o collectoraction.o
+        historydb.o $(Z_COMOBJS) collectoraction.o
 
 RECPTOBJECTS = recptmain.o
 
-LIBRARYOBJECTS = nullproto.o z3950proto.o z3950server.o librarymain.o \
-        zparse.tab.o $(YAZDIR)/client/yaz_zclient.o
+
+ifeq ($(USE_Z3950), 1)
+Z_LIBOBJS=z3950proto.o z3950server.o zparse.tab.o $(YAZDIR)/client/yaz_zclient.o
+else
+Z_LIBOBJS=
+endif
+
+LIBRARYOBJECTS = nullproto.o librarymain.o $(Z_LIBOBJS)
 
 OBJECTS = $(COMMONOBJECTS) $(RECPTOBJECTS) $(LIBRARYOBJECTS)
@@ -185 +210 @@
 
 
-## z39.50 stuff
+## z39.50 rules
 # Note! If USE_FASTCGI=1, yaz is still compiled and linked, but never
 # called by librarymain.cpp.
@@ -228 +253 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
+
 ifneq ($(USE_FASTCGI), 1)
 RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \
@@ -249 +275 @@
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+ifeq ($(USE_Z3950), 1)
+Z_LIBYAZ_A=$(YAZDIR)/lib/libyaz.a
+else
+Z_LIBYAZ_A=
+endif
+
 
 ifneq ($(USE_FASTCGI), 1)
@@ -255 +287 @@
     ../../packages/mg/src/text/libtextin.a \
     ../../packages/mg/lib/libmg.a \
-    $(YAZDIR)/lib/libyaz.a \
+    $(Z_LIBYAZ_A) \
     ../mgpp/text/libtextin.a \
     ../mgpp/lib/libmg.a 
@@ -266 +298 @@
     ../mgpp/text/libtextin.a \
     ../mgpp/lib/libmg.a \
-    $(YAZDIR)/lib/libyaz.a
+    $(Z_LIBYAZ_A)
 endif
 

trunk/gsdl/src/recpt/librarymain.cpp

@@ -2 +2 @@
  *
  * librarymain.cpp -- 
- * Copyright (C) 1999  The New Zealand Digital Library Project
+ * Copyright (C) 1999  The New Zaland Digital Library Project
  *
  * A component of the Greenstone digital library software
@@ -29 +29 @@
 #include "nullproto.h"
 // z39.50 stuff - johnmcp
+#if defined(USE_Z3950)
 #include "z3950proto.h"
+#endif
 #include "collectserver.h"
 #include "filter.h"
@@ -67 +69 @@
   nullproto    nproto;
   collectset  *cservers;
-#ifndef __WIN32__
+#if defined(USE_Z3950)
+  /*#ifndef __WIN32__*/
   z3950proto   zproto;
 #endif
@@ -174 +177 @@
 
   // z39.50 stuff - johnmcp
-#ifndef __WIN32__
+#if defined(USE_Z3950)
+  /*#ifndef __WIN32__*/
   // add the z39.50 server information. Read in the file
   // etc/recpt/z3950.cfg for list of servers and their databases.
@@ -181 +185 @@
   z3950cfg = filename_cat (z3950cfg, "z3950.cfg");
 #ifdef USE_FASTCGI
-  // currently can't use z39.50 if fastcgi is in use
+  // currently can't use z39.50 if fastcgi used
+#warning  "Disabling z39.50 support as fastcgi is in use"
   if (0) {
 #else