Changeset 21418 for main/trunk/greenstone2

Timestamp:

2010-01-04T23:37:05+13:00 (14 years ago)

Author:

davidb

Message:

Correction to how --enable-jdbm flag is implemented

Location:

main/trunk/greenstone2

Files:

• common-src/configure (modified) (4 diffs)
• configure (modified) (4 diffs)

main/trunk/greenstone2/common-src/configure

@@ -312 +312 @@
 ac_subdirs_all="$ac_subdirs_all packages"
 ac_subdirs_all="$ac_subdirs_all indexers"
-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 ENABLE_ACCENTFOLD USE_JDBM USE_SQLITE ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC 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 COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC 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 ENABLE_ACCENTFOLD ENABLE_JDBM USE_SQLITE ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC 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 COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos MODULEDIRS subdirs LTLIBOBJS'
 ac_subst_files=''
 
@@ -860 +860 @@
   --disable-yaz           Disable YAZ compilation
   --disable-accentfold    Disable Accent Folding for MGPP
-  --disable-jdbm        Disable JDBM support
+  --disable-jdbm        Disable JDBM compilation
   --disable-sqlite        Disable SQLite support
   --enable-jni    Enable JNI compilation
@@ -1431 +1431 @@
 if test "${enable_jdbm+set}" = set; then
   enableval="$enable_jdbm"
-  USE_JDBM=0
-else
-  USE_JDBM=1
+  ENABLE_JDBM=$enableval
+else
+  ENABLE_JDBM=yes
 fi;
-cat >>confdefs.h <<\_ACEOF
-#define USE_JDBM $USE_JDBM
-_ACEOF
-
+if test $ENABLE_JDBM = "yes" -o $ENABLE_JDBM = "1" ; then
+  ENABLE_JDBM=1
+  cat >>confdefs.h <<\_ACEOF
+#define ENABLE_JDBM
+_ACEOF
+
+else
+  ENABLE_JDBM=0
+fi
 
 
@@ -7917 +7922 @@
 s,@USE_YAZ@,$USE_YAZ,;t t
 s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t
-s,@USE_JDBM@,$USE_JDBM,;t t
+s,@ENABLE_JDBM@,$ENABLE_JDBM,;t t
 s,@USE_SQLITE@,$USE_SQLITE,;t t
 s,@ENABLE_JNI@,$ENABLE_JNI,;t t

main/trunk/greenstone2/configure

@@ -312 +312 @@
 ac_subdirs_all="$ac_subdirs_all build-src"
 ac_subdirs_all="$ac_subdirs_all runtime-src"
-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 ENABLE_ACCENTFOLD USE_JDBM USE_SQLITE USE_APACHE_HTTPD ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC 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 COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC 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 ENABLE_ACCENTFOLD ENABLE_JDBM USE_SQLITE USE_APACHE_HTTPD ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC 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 COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos MODULEDIRS subdirs LTLIBOBJS'
 ac_subst_files=''
 
@@ -860 +860 @@
   --disable-yaz           Disable YAZ compilation
   --disable-accentfold    Disable Accent Folding for MGPP
-  --disable-jdbm        Disable JDBM support
+  --disable-jdbm        Disable JDBM compilation
   --disable-sqlite        Disable SQLite support
   --enable-apache-httpd  Enable Apache httpd support
@@ -1430 +1430 @@
 if test "${enable_jdbm+set}" = set; then
   enableval="$enable_jdbm"
-  USE_JDBM=0
-else
-  USE_JDBM=1
+  ENABLE_JDBM=$enableval
+else
+  ENABLE_JDBM=yes
 fi;
-cat >>confdefs.h <<\_ACEOF
-#define USE_JDBM $USE_JDBM
-_ACEOF
-
+if test $ENABLE_JDBM = "yes" -o $ENABLE_JDBM = "1" ; then
+  ENABLE_JDBM=1
+  cat >>confdefs.h <<\_ACEOF
+#define ENABLE_JDBM
+_ACEOF
+
+else
+  ENABLE_JDBM=0
+fi
 
 
@@ -7966 +7971 @@
 s,@USE_YAZ@,$USE_YAZ,;t t
 s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t
-s,@USE_JDBM@,$USE_JDBM,;t t
+s,@ENABLE_JDBM@,$ENABLE_JDBM,;t t
 s,@USE_SQLITE@,$USE_SQLITE,;t t
 s,@USE_APACHE_HTTPD@,$USE_APACHE_HTTPD,;t t