Changeset 21418

Show
Ignore:
Timestamp:
04.01.2010 23:37:05 (9 years ago)
Author:
davidb
Message:

Correction to how --enable-jdbm flag is implemented

Location:
main/trunk/greenstone2
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/configure

    r21409 r21418  
    312312ac_subdirs_all="$ac_subdirs_all packages" 
    313313ac_subdirs_all="$ac_subdirs_all indexers" 
    314 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' 
     314ac_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' 
    315315ac_subst_files='' 
    316316 
     
    860860  --disable-yaz           Disable YAZ compilation 
    861861  --disable-accentfold    Disable Accent Folding for MGPP 
    862   --disable-jdbm        Disable JDBM support 
     862  --disable-jdbm        Disable JDBM compilation 
    863863  --disable-sqlite        Disable SQLite support 
    864864  --enable-jni    Enable JNI compilation 
     
    14311431if test "${enable_jdbm+set}" = set; then 
    14321432  enableval="$enable_jdbm" 
    1433   USE_JDBM=0 
    1434 else 
    1435   USE_JDBM=1 
     1433  ENABLE_JDBM=$enableval 
     1434else 
     1435  ENABLE_JDBM=yes 
    14361436fi; 
    1437 cat >>confdefs.h <<\_ACEOF 
    1438 #define USE_JDBM $USE_JDBM 
    1439 _ACEOF 
    1440  
     1437if test $ENABLE_JDBM = "yes" -o $ENABLE_JDBM = "1" ; then 
     1438  ENABLE_JDBM=1 
     1439  cat >>confdefs.h <<\_ACEOF 
     1440#define ENABLE_JDBM 
     1441_ACEOF 
     1442 
     1443else 
     1444  ENABLE_JDBM=0 
     1445fi 
    14411446 
    14421447 
     
    79177922s,@USE_YAZ@,$USE_YAZ,;t t 
    79187923s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t 
    7919 s,@USE_JDBM@,$USE_JDBM,;t t 
     7924s,@ENABLE_JDBM@,$ENABLE_JDBM,;t t 
    79207925s,@USE_SQLITE@,$USE_SQLITE,;t t 
    79217926s,@ENABLE_JNI@,$ENABLE_JNI,;t t 
  • main/trunk/greenstone2/configure

    r21409 r21418  
    312312ac_subdirs_all="$ac_subdirs_all build-src" 
    313313ac_subdirs_all="$ac_subdirs_all runtime-src" 
    314 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' 
     314ac_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' 
    315315ac_subst_files='' 
    316316 
     
    860860  --disable-yaz           Disable YAZ compilation 
    861861  --disable-accentfold    Disable Accent Folding for MGPP 
    862   --disable-jdbm        Disable JDBM support 
     862  --disable-jdbm        Disable JDBM compilation 
    863863  --disable-sqlite        Disable SQLite support 
    864864  --enable-apache-httpd  Enable Apache httpd support 
     
    14301430if test "${enable_jdbm+set}" = set; then 
    14311431  enableval="$enable_jdbm" 
    1432   USE_JDBM=0 
    1433 else 
    1434   USE_JDBM=1 
     1432  ENABLE_JDBM=$enableval 
     1433else 
     1434  ENABLE_JDBM=yes 
    14351435fi; 
    1436 cat >>confdefs.h <<\_ACEOF 
    1437 #define USE_JDBM $USE_JDBM 
    1438 _ACEOF 
    1439  
     1436if test $ENABLE_JDBM = "yes" -o $ENABLE_JDBM = "1" ; then 
     1437  ENABLE_JDBM=1 
     1438  cat >>confdefs.h <<\_ACEOF 
     1439#define ENABLE_JDBM 
     1440_ACEOF 
     1441 
     1442else 
     1443  ENABLE_JDBM=0 
     1444fi 
    14401445 
    14411446 
     
    79667971s,@USE_YAZ@,$USE_YAZ,;t t 
    79677972s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t 
    7968 s,@USE_JDBM@,$USE_JDBM,;t t 
     7973s,@ENABLE_JDBM@,$ENABLE_JDBM,;t t 
    79697974s,@USE_SQLITE@,$USE_SQLITE,;t t 
    79707975s,@USE_APACHE_HTTPD@,$USE_APACHE_HTTPD,;t t