disable-zoom configure option

diff --git a/configure.in b/configure.in
index 7e5e35f..78d4da0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -60,6 +60,8 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbo
 ])
 dnl 
 
 ])
 dnl 
 

+AC_ARG_ENABLE(zoom,[  --disable-zoom          disable ZOOM (for old C++ compilers)],[enable_zoom=$enableval],[enable_zoom=yes])
+AM_CONDITIONAL(ZOOM, test $enable_zoom = "yes")

 
 AC_SUBST(YAZPP_SRC_ROOT)
 AC_SUBST(YAZPP_BUILD_ROOT)
 
 AC_SUBST(YAZPP_SRC_ROOT)
 AC_SUBST(YAZPP_BUILD_ROOT)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7a81483..d4298c7 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,10 +1,16 @@
-## $Id: Makefile.am,v 1.1 2002-10-09 16:17:26 adam Exp $
+## $Id: Makefile.am,v 1.2 2003-06-10 07:16:38 adam Exp $

 
 LDFLAGS=-version-info 1:0:0
 
 lib_LTLIBRARIES = libyaz++.la
 
 
 LDFLAGS=-version-info 1:0:0
 
 lib_LTLIBRARIES = libyaz++.la
 

-libyaz___la_LIBADD=../zoom/libzoomcpp.la ../src/libyazcpp.la 
+if ZOOM
+libzoom=../zoom/libzoomcpp.la
+else
+libzoom=
+endif
+
+libyaz___la_LIBADD=$(libzoom) ../src/libyazcpp.la 

 libyaz___la_SOURCES=
 EXTRA_libyaz___la_SOURCES=x.c
 
 libyaz___la_SOURCES=
 EXTRA_libyaz___la_SOURCES=x.c
 

diff --git a/zoom/Makefile.am b/zoom/Makefile.am
index c75f866..fe43d98 100644 (file)
--- a/zoom/Makefile.am
+++ b/zoom/Makefile.am
@@ -1,22 +1,22 @@
-# $Header: /home/cvsroot/yaz++/zoom/Makefile.am,v 1.7 2002-11-04 23:08:49 mike Exp $
+# $Header: /home/cvsroot/yaz++/zoom/Makefile.am,v 1.8 2003-06-10 07:16:38 adam Exp $

 
 AM_CXXFLAGS= $(YAZINC) 
 
 
 AM_CXXFLAGS= $(YAZINC) 
 

+if ZOOM

 noinst_LTLIBRARIES = libzoomcpp.la
 noinst_LTLIBRARIES = libzoomcpp.la

+noinst_PROGRAMS = zclient
+endif
+

 LDADD=libzoomcpp.la $(YAZLALIB)
 
 mirk_XXX_SOURCES = zexcept.cpp zconn.cpp zquery.cpp zrs.cpp zrec.cpp
 libzoomcpp_la_SOURCES = $(mirk_XXX_SOURCES) interface.h
 pkginclude_HEADERS=zoom.h
 
 LDADD=libzoomcpp.la $(YAZLALIB)
 
 mirk_XXX_SOURCES = zexcept.cpp zconn.cpp zquery.cpp zrs.cpp zrec.cpp
 libzoomcpp_la_SOURCES = $(mirk_XXX_SOURCES) interface.h
 pkginclude_HEADERS=zoom.h
 

-noinst_PROGRAMS = zclient
-

 zclient_SOURCES=zclient.cpp
 
 EXTRA_DIST=master-header Changes README
 
 zclient_SOURCES=zclient.cpp
 
 EXTRA_DIST=master-header Changes README
 

-all: interface.h zclient
-

 test: zclient
        ./zclient bagel.indexdata.dk 210 gils '@and mineral epicenter'
 
 test: zclient
        ./zclient bagel.indexdata.dk 210 gils '@and mineral epicenter'