Changeset 22070

Show
Ignore:
Timestamp:
10.05.2010 18:24:37 (10 years ago)
Author:
ak19
Message:

Undoing the commits of 22058 to the indexer folder: USE_GDBM, USE_JDBM are not relevant here (or USE_SQLITE).

Location:
main/trunk/greenstone2/common-src/indexers
Files:
13 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/indexers/Makefile.in

    r22058 r22070  
    5858endif 
    5959 
    60 USE_GDBM = @USE_GDBM@ 
    61 ifeq ($(USE_GDBM), 1) 
    62 GDBM_DEFINES = -DUSE_GDBM 
    63 else 
    64 GDBM_DEFINES = 
    65 endif 
    66  
    67 USE_JDBM = @USE_JDBM@ 
    68 ifeq ($(USE_JDBM), 1) 
    69 JDBM_DEFINES = -DUSE_JDBM 
    70 else 
    71 JDBM_DEFINES = 
    72 endif 
    73  
    74 USE_SQLITE = @USE_SQLITE@ 
    75 ifeq ($(USE_SQLITE), 1) 
    76 USE_SQLITE = -DUSE_SQLITE 
    77 else 
    78 USE_SQLITE = 
    79 endif 
    8060 
    8161INDEXERDIRS = $(UNAC) $(MG) $(MGPP) $(LUCENE) 
    82 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 
     62 
    8363 
    8464clean: 
  • main/trunk/greenstone2/common-src/indexers/configure

    r22058 r22070  
    275275ac_subdirs_all="$ac_subdirs_all mg" 
    276276ac_subdirs_all="$ac_subdirs_all mgpp" 
    277 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 USE_JDBM USE_GDBM ENABLE_ACCENTFOLD ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE COMPAT32BITFLAGS JAVAC JAVA uudecode subdirs LIBOBJS LTLIBOBJS' 
     277ac_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 ENABLE_ACCENTFOLD ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE COMPAT32BITFLAGS JAVAC JAVA uudecode subdirs LIBOBJS LTLIBOBJS' 
    278278ac_subst_files='' 
    279279 
     
    786786  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no) 
    787787  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes] 
    788   --disable-jdbm        Disable JDBM compilation 
    789   --disable-gdbm        Disable GDBM compilation 
    790788  --disable-accentfold    Disable Accent Folding for MGPP 
    791789  --enable-jni    Enable JNI compilation 
     
    12361234 
    12371235 
    1238 # Check whether --enable-jdbm or --disable-jdbm was given. 
    1239 if test "${enable_jdbm+set}" = set; then 
    1240   enableval="$enable_jdbm" 
    1241   USE_JDBM=$enableval 
    1242 else 
    1243   USE_JDBM=yes 
    1244 fi; 
    1245 if test $USE_JDBM = "yes" -o $USE_JDBM = "1" ; then 
    1246   USE_JDBM=1 
    1247   cat >>confdefs.h <<\_ACEOF 
    1248 #define USE_JDBM 
    1249 _ACEOF 
    1250  
    1251 else 
    1252   USE_JDBM=0 
    1253 fi 
    1254  
    1255  
    1256 # Check whether --enable-gdbm or --disable-gdbm was given. 
    1257 if test "${enable_gdbm+set}" = set; then 
    1258   enableval="$enable_gdbm" 
    1259   USE_GDBM=$enableval 
    1260 else 
    1261   USE_GDBM=yes 
    1262 fi; 
    1263 if test $USE_GDBM = "yes" -o $USE_GDBM = "1" ; then 
    1264   USE_GDBM=1 
    1265   cat >>confdefs.h <<\_ACEOF 
    1266 #define USE_GDBM 
    1267 _ACEOF 
    1268  
    1269 else 
    1270   USE_GDBM=0 
    1271 fi 
    1272  
    1273  
    12741236 
    12751237# Check whether --enable-accentfold or --disable-accentfold was given. 
     
    14731435CLASS_TEST=Test.class 
    14741436cat << \EOF > $JAVA_TEST 
    1475 /* #line 1475 "configure" */ 
     1437/* #line 1437 "configure" */ 
    14761438public class Test { 
    14771439} 
     
    16431605        ac_cv_prog_uudecode_base64=yes 
    16441606else 
    1645         echo "configure: 1645: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 
     1607        echo "configure: 1607: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 
    16461608        echo "configure: failed file was:" >&5 
    16471609        cat Test.uue >&5 
     
    17611723CLASS_TEST=Test.class 
    17621724cat << \EOF > $JAVA_TEST 
    1763 /* #line 1763 "configure" */ 
     1725/* #line 1725 "configure" */ 
    17641726public class Test { 
    17651727} 
     
    17981760TEST=Test 
    17991761cat << \EOF > $JAVA_TEST 
    1800 /* [#]line 1800 "configure" */ 
     1762/* [#]line 1762 "configure" */ 
    18011763public class Test { 
    18021764public static void main (String args[]) { 
     
    25542516s,@ECHO_T@,$ECHO_T,;t t 
    25552517s,@LIBS@,$LIBS,;t t 
    2556 s,@USE_JDBM@,$USE_JDBM,;t t 
    2557 s,@USE_GDBM@,$USE_GDBM,;t t 
    25582518s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t 
    25592519s,@ENABLE_JNI@,$ENABLE_JNI,;t t 
  • main/trunk/greenstone2/common-src/indexers/configure.ac

    r22058 r22070  
    33dnl http://www.gnu.org/software/hello/manual/autoconf/Initializing-configure.html 
    44AC_INIT() 
    5  
    6 dnl 
    7 dnl Set use of JDBM (enabled by default) 
    8 dnl 
    9 AC_ARG_ENABLE(jdbm, [  --disable-jdbm        Disable JDBM compilation], USE_JDBM=$enableval, USE_JDBM=yes) 
    10 if test $USE_JDBM = "yes" -o $USE_JDBM = "1" ; then 
    11   USE_JDBM=1 
    12   AC_DEFINE(USE_JDBM,[]) 
    13 else 
    14   USE_JDBM=0 
    15 fi 
    16 AC_SUBST(USE_JDBM) 
    17  
    18 dnl 
    19 dnl Set use of GDBM (enabled by default) 
    20 dnl 
    21 AC_ARG_ENABLE(gdbm, [  --disable-gdbm        Disable GDBM compilation], USE_GDBM=$enableval, USE_GDBM=yes) 
    22 if test $USE_GDBM = "yes" -o $USE_GDBM = "1" ; then 
    23   USE_GDBM=1 
    24   AC_DEFINE(USE_GDBM,[]) 
    25 else 
    26   USE_GDBM=0 
    27 fi 
    28 AC_SUBST(USE_GDBM) 
    295 
    306 
  • main/trunk/greenstone2/common-src/indexers/mg/configure

    r22058 r22070  
    310310#endif" 
    311311 
    312 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os PACKAGE VERSION COMPAT32BITFLAGS USE_JDBM USE_GDBM CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT AWK YACC CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP U ANSI2KNR ALLOCA LIBOBJS JNIINC JNISUFFIX JNIFLAGS LTLIBOBJS' 
     312ac_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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os PACKAGE VERSION COMPAT32BITFLAGS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT AWK YACC CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP U ANSI2KNR ALLOCA LIBOBJS JNIINC JNISUFFIX JNIFLAGS LTLIBOBJS' 
    313313ac_subst_files='' 
    314314 
     
    855855 
    856856  cat <<\_ACEOF 
    857  
    858 Optional Features: 
    859   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no) 
    860   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes] 
    861   --disable-jdbm        Disable JDBM compilation 
    862   --disable-gdbm        Disable GDBM compilation 
    863857 
    864858Optional Packages: 
     
    14761470    COMPAT32BITFLAGS= 
    14771471  fi 
    1478 fi 
    1479  
    1480  
    1481  
    1482 # Check whether --enable-jdbm or --disable-jdbm was given. 
    1483 if test "${enable_jdbm+set}" = set; then 
    1484   enableval="$enable_jdbm" 
    1485   USE_JDBM=$enableval 
    1486 else 
    1487   USE_JDBM=yes 
    1488 fi; 
    1489 if test $USE_JDBM = "yes" -o $USE_JDBM = "1" ; then 
    1490   USE_JDBM=1 
    1491   cat >>confdefs.h <<\_ACEOF 
    1492 #define USE_JDBM 
    1493 _ACEOF 
    1494  
    1495 else 
    1496   USE_JDBM=0 
    1497 fi 
    1498  
    1499  
    1500 # Check whether --enable-gdbm or --disable-gdbm was given. 
    1501 if test "${enable_gdbm+set}" = set; then 
    1502   enableval="$enable_gdbm" 
    1503   USE_GDBM=$enableval 
    1504 else 
    1505   USE_GDBM=yes 
    1506 fi; 
    1507 if test $USE_GDBM = "yes" -o $USE_GDBM = "1" ; then 
    1508   USE_GDBM=1 
    1509   cat >>confdefs.h <<\_ACEOF 
    1510 #define USE_GDBM 
    1511 _ACEOF 
    1512  
    1513 else 
    1514   USE_GDBM=0 
    15151472fi 
    15161473 
     
    72897246s,@VERSION@,$VERSION,;t t 
    72907247s,@COMPAT32BITFLAGS@,$COMPAT32BITFLAGS,;t t 
    7291 s,@USE_JDBM@,$USE_JDBM,;t t 
    7292 s,@USE_GDBM@,$USE_GDBM,;t t 
    72937248s,@CXX@,$CXX,;t t 
    72947249s,@CXXFLAGS@,$CXXFLAGS,;t t 
  • main/trunk/greenstone2/common-src/indexers/mg/configure.in

    r22058 r22070  
    3636fi 
    3737AC_SUBST(COMPAT32BITFLAGS) 
    38  
    39  
    40 dnl 
    41 dnl Set use of JDBM (enabled by default) 
    42 dnl 
    43 AC_ARG_ENABLE(jdbm, [  --disable-jdbm        Disable JDBM compilation], USE_JDBM=$enableval, USE_JDBM=yes) 
    44 if test $USE_JDBM = "yes" -o $USE_JDBM = "1" ; then 
    45   USE_JDBM=1 
    46   AC_DEFINE(USE_JDBM,[]) 
    47 else 
    48   USE_JDBM=0 
    49 fi 
    50 AC_SUBST(USE_JDBM) 
    51  
    52 dnl 
    53 dnl Set use of GDBM (enabled by default) 
    54 dnl 
    55 AC_ARG_ENABLE(gdbm, [  --disable-gdbm        Disable GDBM compilation], USE_GDBM=$enableval, USE_GDBM=yes) 
    56 if test $USE_GDBM = "yes" -o $USE_GDBM = "1" ; then 
    57   USE_GDBM=1 
    58   AC_DEFINE(USE_GDBM,[]) 
    59 else 
    60   USE_GDBM=0 
    61 fi 
    62 AC_SUBST(USE_GDBM) 
    6338 
    6439 
  • main/trunk/greenstone2/common-src/indexers/mg/jni/Makefile.in

    r22058 r22070  
    1111transform = @program_transform_name@ 
    1212 
    13 USE_GDBM = @USE_GDBM@ 
    14 ifeq ($(USE_GDBM), 1) 
    15 GDBM_DEFINES = -DUSE_GDBM 
    16 else 
    17 GDBM_DEFINES =  
    18 endif 
    19  
    20 USE_JDBM = @USE_JDBM@ 
    21 ifeq ($(USE_JDBM), 1) 
    22 JDBM_DEFINES = -DUSE_JDBM 
    23 else 
    24 JDBM_DEFINES =  
    25 endif 
    26  
    27 USE_SQLITE = @USE_SQLITE@ 
    28 ifeq ($(USE_SQLITE), 1) 
    29 SQLITE_DEFINES = -DUSE_SQLITE 
    30 else 
    31 SQLITE_DEFINES = 
    32 endif 
    3313 
    3414AR = ar 
    3515CC = @CC@ 
    3616CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fpic -DSILENT -DSHORT_SUFFIX -DNZDL -DQUIET -DPARADOCNUM 
    37 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 
     17DEFS = @DEFS@ 
    3818RANLIB = @RANLIB@ 
    3919INSTALL = @INSTALL@ 
  • main/trunk/greenstone2/common-src/indexers/mg/lib/Makefile.in

    r22058 r22070  
    3131VPATH = @srcdir@ 
    3232 
    33 USE_GDBM = @USE_GDBM@ 
    34 ifeq ($(USE_GDBM), 1) 
    35 GDBM_DEFINES = -DUSE_GDBM 
    36 else 
    37 GDBM_DEFINES =  
    38 endif 
    39  
    40 USE_JDBM = @USE_JDBM@ 
    41 ifeq ($(USE_JDBM), 1) 
    42 JDBM_DEFINES = -DUSE_JDBM 
    43 else 
    44 JDBM_DEFINES =  
    45 endif 
    46  
    47 USE_SQLITE = @USE_SQLITE@ 
    48 ifeq ($(USE_SQLITE), 1) 
    49 SQLITE_DEFINES = -DUSE_SQLITE 
    50 else 
    51 SQLITE_DEFINES = 
    52 endif 
    5333 
    5434AR = ar 
    5535CC = @CC@ 
    5636CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic  
    57 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 
     37DEFS = @DEFS@ 
    5838RANLIB = @RANLIB@ 
    5939 
  • main/trunk/greenstone2/common-src/indexers/mg/src/text/Makefile.in

    r22058 r22070  
    3535transform = @program_transform_name@ 
    3636 
    37 USE_GDBM = @USE_GDBM@ 
    38 ifeq ($(USE_GDBM), 1) 
    39 GDBM_DEFINES = -DUSE_GDBM 
    40 else 
    41 GDBM_DEFINES =  
    42 endif 
    43  
    44 USE_JDBM = @USE_JDBM@ 
    45 ifeq ($(USE_JDBM), 1) 
    46 JDBM_DEFINES = -DUSE_JDBM 
    47 else 
    48 JDBM_DEFINES =  
    49 endif 
    50  
    51 USE_SQLITE = @USE_SQLITE@ 
    52 ifeq ($(USE_SQLITE), 1) 
    53 SQLITE_DEFINES = -DUSE_SQLITE 
    54 else 
    55 SQLITE_DEFINES = 
    56 endif 
    5737 
    5838AR = ar 
    5939CC = @CC@ 
    6040CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic 
    61 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 
     41DEFS = @DEFS@ 
    6242RANLIB = @RANLIB@ 
    6343INSTALL = @INSTALL@ 
  • main/trunk/greenstone2/common-src/indexers/mgpp/configure

    r22058 r22070  
    310310#endif" 
    311311 
    312 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os PACKAGE VERSION COMPAT32BITFLAGS ENABLE_ACCENTFOLD USE_JDBM USE_GDBM CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT AWK YACC CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP U ANSI2KNR UNAC_DIR ALLOCA LIBOBJS JNIINC JNISUFFIX JNIFLAGS LTLIBOBJS' 
     312ac_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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os PACKAGE VERSION COMPAT32BITFLAGS ENABLE_ACCENTFOLD CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT AWK YACC CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP U ANSI2KNR UNAC_DIR ALLOCA LIBOBJS JNIINC JNISUFFIX JNIFLAGS LTLIBOBJS' 
    313313ac_subst_files='' 
    314314 
     
    860860  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes] 
    861861  --disable-accentfold    Disable Accent Folding for MGPP 
    862   --disable-jdbm        Disable JDBM compilation 
    863   --disable-gdbm        Disable GDBM compilation 
    864862  --enable-override-longlong 
    865863                          overide use of long long with GCC 
     
    15011499fi 
    15021500 
    1503  
    1504 # Check whether --enable-jdbm or --disable-jdbm was given. 
    1505 if test "${enable_jdbm+set}" = set; then 
    1506   enableval="$enable_jdbm" 
    1507   USE_JDBM=$enableval 
    1508 else 
    1509   USE_JDBM=yes 
    1510 fi; 
    1511 if test $USE_JDBM = "yes" -o $USE_JDBM = "1" ; then 
    1512   USE_JDBM=1 
    1513   cat >>confdefs.h <<\_ACEOF 
    1514 #define USE_JDBM 
    1515 _ACEOF 
    1516  
    1517 else 
    1518   USE_JDBM=0 
    1519 fi 
    1520  
    1521  
    1522 # Check whether --enable-gdbm or --disable-gdbm was given. 
    1523 if test "${enable_gdbm+set}" = set; then 
    1524   enableval="$enable_gdbm" 
    1525   USE_GDBM=$enableval 
    1526 else 
    1527   USE_GDBM=yes 
    1528 fi; 
    1529 if test $USE_GDBM = "yes" -o $USE_GDBM = "1" ; then 
    1530   USE_GDBM=1 
    1531   cat >>confdefs.h <<\_ACEOF 
    1532 #define USE_GDBM 
    1533 _ACEOF 
    1534  
    1535 else 
    1536   USE_GDBM=0 
    1537 fi 
    15381501 
    15391502 
     
    83978360s,@COMPAT32BITFLAGS@,$COMPAT32BITFLAGS,;t t 
    83988361s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t 
    8399 s,@USE_JDBM@,$USE_JDBM,;t t 
    8400 s,@USE_GDBM@,$USE_GDBM,;t t 
    84018362s,@CXX@,$CXX,;t t 
    84028363s,@CXXFLAGS@,$CXXFLAGS,;t t 
  • main/trunk/greenstone2/common-src/indexers/mgpp/configure.in

    r22058 r22070  
    4949AC_SUBST(ENABLE_ACCENTFOLD) 
    5050 
    51 dnl 
    52 dnl Set use of JDBM (enabled by default) 
    53 dnl 
    54 AC_ARG_ENABLE(jdbm, [  --disable-jdbm        Disable JDBM compilation], USE_JDBM=$enableval, USE_JDBM=yes) 
    55 if test $USE_JDBM = "yes" -o $USE_JDBM = "1" ; then 
    56   USE_JDBM=1 
    57   AC_DEFINE(USE_JDBM,[]) 
    58 else 
    59   USE_JDBM=0 
    60 fi 
    61 AC_SUBST(USE_JDBM) 
    62  
    63 dnl 
    64 dnl Set use of GDBM (enabled by default) 
    65 dnl 
    66 AC_ARG_ENABLE(gdbm, [  --disable-gdbm        Disable GDBM compilation], USE_GDBM=$enableval, USE_GDBM=yes) 
    67 if test $USE_GDBM = "yes" -o $USE_GDBM = "1" ; then 
    68   USE_GDBM=1 
    69   AC_DEFINE(USE_GDBM,[]) 
    70 else 
    71   USE_GDBM=0 
    72 fi 
    73 AC_SUBST(USE_GDBM) 
    7451 
    7552dnl Checks for programs. 
  • main/trunk/greenstone2/common-src/indexers/mgpp/jni/Makefile.in

    r22058 r22070  
    2222endif 
    2323 
    24 USE_GDBM = @USE_GDBM@ 
    25 ifeq ($(USE_GDBM), 1) 
    26 GDBM_DEFINES = -DUSE_GDBM 
    27 else 
    28 GDBM_DEFINES =  
    29 endif 
    30  
    31 USE_JDBM = @USE_JDBM@ 
    32 ifeq ($(USE_JDBM), 1) 
    33 JDBM_DEFINES = -DUSE_JDBM 
    34 else 
    35 JDBM_DEFINES =  
    36 endif 
    37  
    38 USE_SQLITE = @USE_SQLITE@ 
    39 ifeq ($(USE_SQLITE), 1) 
    40 SQLITE_DEFINES = -DUSE_SQLITE 
    41 else 
    42 SQLITE_DEFINES = 
    43 endif 
    44  
    4524 
    4625AR = ar 
     
    4928CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fPIC -ansi -DSILENT -DSHORT_SUFFIX 
    5029CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX 
    51 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 
     30DEFS = @DEFS@ 
    5231RANLIB = @RANLIB@ 
    5332INSTALL = @INSTALL@ 
  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/Makefile.in

    r22058 r22070  
    3131VPATH = @srcdir@ 
    3232 
    33 USE_GDBM = @USE_GDBM@ 
    34 ifeq ($(USE_GDBM), 1) 
    35 GDBM_DEFINES = -DUSE_GDBM 
    36 else 
    37 GDBM_DEFINES =  
    38 endif 
    39  
    40 USE_JDBM = @USE_JDBM@ 
    41 ifeq ($(USE_JDBM), 1) 
    42 JDBM_DEFINES = -DUSE_JDBM 
    43 else 
    44 JDBM_DEFINES =  
    45 endif 
    46  
    47 USE_SQLITE = @USE_SQLITE@ 
    48 ifeq ($(USE_SQLITE), 1) 
    49 SQLITE_DEFINES = -DUSE_SQLITE 
    50 else 
    51 SQLITE_DEFINES = 
    52 endif 
    5333 
    5434AR = ar 
     
    6141endif 
    6242CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -fPIC 
    63 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 
     43DEFS = @DEFS@ 
    6444RANLIB = @RANLIB@ 
    6545 
  • main/trunk/greenstone2/common-src/indexers/mgpp/text/Makefile.in

    r22058 r22070  
    3838endif 
    3939 
    40 USE_GDBM = @USE_GDBM@ 
    41 ifeq ($(USE_GDBM), 1) 
    42 GDBM_DEFINES = -DUSE_GDBM 
    43 else 
    44 GDBM_DEFINES =  
    45 endif 
    46  
    47 USE_JDBM = @USE_JDBM@ 
    48 ifeq ($(USE_JDBM), 1) 
    49 JDBM_DEFINES = -DUSE_JDBM 
    50 else 
    51 JDBM_DEFINES =  
    52 endif 
    53  
    54 USE_SQLITE = @USE_SQLITE@ 
    55 ifeq ($(USE_SQLITE), 1) 
    56 SQLITE_DEFINES = -DUSE_SQLITE 
    57 else 
    58 SQLITE_DEFINES = 
    59 endif 
    6040 
    6141SHELL = /bin/sh 
     
    7555CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS) 
    7656CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS) 
    77 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 
     57DEFS = @DEFS@ 
    7858RANLIB = @RANLIB@ 
    7959INSTALL = @INSTALL@