Changeset 22058 for main/trunk/greenstone2/common-src/packages
- Timestamp:
- 2010-05-06T21:23:54+12:00 (14 years ago)
- Location:
- main/trunk/greenstone2/common-src/packages
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/packages/Makefile.in
r21869 r22058 25 25 ########################################################################### 26 26 27 USE_GDBM=@USE_GDBM@ 28 ifeq ($(USE_GDBM), 1) 29 GDBM_DEFINES = -DUSE_GDBM 30 else 31 GDBM_DEFINES = 32 endif 27 33 28 ENABLE_JDBM=@ENABLE_JDBM@ 29 30 ifeq ($(ENABLE_JDBM), 1) 34 USE_JDBM=@USE_JDBM@ 35 ifeq ($(USE_JDBM), 1) 31 36 JDBM_DIR = jdbm/jdbm-1.0 37 JDBM_DEFINES = -DUSE_JDBM 32 38 else 33 JDBM_DIR = 39 JDBM_DIR = 40 JDBM_DEFINES = 34 41 endif 35 42 36 43 USE_SQLITE=@USE_SQLITE@ 37 38 44 ifeq ($(USE_SQLITE), 1) 39 45 SQLITE_DIR = sqlite/sqlite-amalgamation-3.6.23.1 46 SQLITE_DEFINES = -DUSE_SQLITE 40 47 else 41 48 SQLITE_DIR = 49 SQLITE_DEFINES = 42 50 endif 51 52 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 43 53 44 54 # COMPILEDIRS contains the packages that we want to make and install. It … … 56 66 (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 57 67 done 58 ifeq ($( ENABLE_JDBM), 1)68 ifeq ($(USE_JDBM), 1) 59 69 # do 'make install' in jdbm directory to get the jar file into the right place 60 70 cd $(JDBM_DIR) && $(MAKE) $(MDEFINES) install -
main/trunk/greenstone2/common-src/packages/configure
r21873 r22058 22 22 ENVIRONMENT="" 23 23 24 # GDBM support enabled by default, can switch it off with --disable-jdbm 25 USE_GDBM=1 24 26 # JDBM support enabled by default, can switch it off with --disable-jdbm 25 ENABLE_JDBM=127 USE_JDBM=1 26 28 # SQLite support enabled by default, can switch it off with --disable-sqlite 27 29 USE_SQLITE=true … … 51 53 fi 52 54 ;; 55 --disable-gdbm) 56 USE_GDBM=0 57 ;; 53 58 --disable-jdbm) 54 ENABLE_JDBM=059 USE_JDBM=0 55 60 ;; 56 61 --disable-sqlite) … … 200 205 echo "" 201 206 echo "Configuring GDBM" 202 echo "" 203 cd "$PACKAGES/gdbm" 204 205 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix=$PACKAGES/gdbm $HOSTTARGETFLAGS $ENVIRONMENT 206 207 cd "$PACKAGES/gdbm/gdbm-1.8.3" && \ 208 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix=$PACKAGES/gdbm $HOSTTARGETFLAGS $ENVIRONMENT 209 207 if test $USE_GDBM ; 208 then 209 echo "" 210 cd "$PACKAGES/gdbm" 211 212 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix=$PACKAGES/gdbm $HOSTTARGETFLAGS $ENVIRONMENT 213 214 cd "$PACKAGES/gdbm/gdbm-1.8.3" && \ 215 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --prefix=$PACKAGES/gdbm $HOSTTARGETFLAGS $ENVIRONMENT 216 else 217 echo " GDBM support disabled." 218 echo " add '--enable-gdbm' to the configure command to include GDBM support." 219 echo "" 220 fi 210 221 211 222 # configure JDBM 212 223 echo "" 213 224 echo "Configuring JDBM" 214 if test $ ENABLE_JDBM ;225 if test $USE_JDBM ; 215 226 then 216 227 echo ""
Note:
See TracChangeset
for help on using the changeset viewer.