Changeset 21409 for main/trunk/greenstone2/common-src/packages
- Timestamp:
- 2010-01-04T23:08:33+13: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
r20832 r21409 26 26 27 27 28 USE_JDBM=@USE_JDBM@ 29 30 ifeq ($(USE_JDBM), 1) 31 JDBM_DIR = jdbm/jdbm-1.0 32 else 33 JDBM_DIR = 34 endif 35 28 36 USE_SQLITE=@USE_SQLITE@ 29 37 … … 39 47 # CLEANDIRS is COMPILEDIRS and iconv and expat. Iconv and expat get compiled 40 48 # up during the configure stage itself. 41 COMPILEDIRS = gdbm $(SQLITE_DIR) search4j49 COMPILEDIRS = gdbm $(SQLITE_DIR) $(JDBM_DIR) search4j 42 50 CLEANDIRS = iconv expat $(COMPILEDIRS) 43 51 … … 48 56 (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 49 57 done 58 ifeq ($(USE_JDBM), 1) 59 # do 'make install' in jdbm directory to get the jar file into the right place 60 cd $(JDBM_DIR) && $(MAKE) $(MDEFINES) install 61 endif 50 62 ifeq ($(USE_SQLITE), 1) 51 63 # need to do make install in sqlite to get the header files and library into the right place -
main/trunk/greenstone2/common-src/packages/configure
r20832 r21409 181 181 182 182 183 # configure JDBM 184 echo "" 185 echo "Configuring JDBM" 186 if test x$USE_JDBM = xtrue ; 187 then 188 echo "" 189 cd "$PACKAGES/jdbm" 190 if test ! -d jdbm-1.0 ; 191 then 192 gzip -dc gs-jdbm-1.0.tar.gz | tar -xf - 193 fi 194 else 195 echo "JDBM support disabled." 196 echo " add '--enable-jdbm' to the configure command to include JDBM support." 197 echo "" 198 fi 199 183 200 # configure SQLite 184 201 echo "" … … 189 206 cd "$PACKAGES/sqlite" 190 207 if test ! -d sqlite-amalgamation-3.5.9 ; 191 then 208 then 192 209 gzip -dc sqlite-amalgamation-3.5.9.tar.gz | tar -xf - 193 210 fi
Note:
See TracChangeset
for help on using the changeset viewer.