Changeset 12492

Timestamp:

2006-08-22T14:54:05+12:00 (18 years ago)

Author:

kjdon

Message:

added a new flag: disable-yaz. yaz is now compiled by default (for use with downloading in GLI), but z3950 support in greenstone library is still left under the control of --enable-z3950. the disable-yaz flag turns off the compilation of yaz for those compiling from source if they don't need it

Location:

trunk/gsdl

Files:

• configure (modified) (4 diffs)
• configure.in (modified) (1 diff)

trunk/gsdl/configure

@@ -311 +311 @@
 
 ac_subdirs_all="$ac_subdirs_all packages"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 CFLAGS CC LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC GDBM_LIBPATH GDBM_INCLUDE gsdlos MODULEDIRS subdirs LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ CFLAGS CC LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC GDBM_LIBPATH GDBM_INCLUDE gsdlos MODULEDIRS subdirs LTLIBOBJS'
 ac_subst_files=''
 
@@ -857 +857 @@
   --enable-corba          Enable CORBA support
   --enable-z3950          Enable Z39.50 client support
+  --disable-yaz          Disable YAZ compilation
 
 Optional Packages:
@@ -1391 +1392 @@
 fi
 
+# Check whether --enable-yaz or --disable-yaz was given.
+if test "${enable_yaz+set}" = set; then
+  enableval="$enable_yaz"
+  USE_YAZ=0
+else
+  USE_YAZ=1
+fi;
+cat >>confdefs.h <<\_ACEOF
+#define USE_YAZ $USE_YAZ
+_ACEOF
+
+
+
 
 # Check whether --with-gdbm or --without-gdbm was given.
@@ -7939 +7953 @@
 s,@MICO_DIR@,$MICO_DIR,;t t
 s,@USE_Z3950@,$USE_Z3950,;t t
+s,@USE_YAZ@,$USE_YAZ,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@CC@,$CC,;t t

trunk/gsdl/configure.in

@@ -49 +49 @@
 AC_SUBST(USE_Z3950)
 fi
+
+dnl
+dnl Set use of yaz - now compiled by default even when z3950 support not required
+dnl
+AC_ARG_ENABLE(yaz, [  --disable-yaz          Disable YAZ compilation], USE_YAZ=0, USE_YAZ=1)
+dnl if test USE_YAZ = 1; then
+AC_DEFINE(USE_YAZ, $USE_YAZ)
+AC_SUBST(USE_YAZ)
+dnl fi
 
 dnl