Changeset 15815

Show
Ignore:
Timestamp:
30.05.2008 11:25:14 (11 years ago)
Author:
mdewsnip
Message:

(Adding new DB support) Now only compiles SQLite if it has been enabled.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/packages/Makefile.in

    r15791 r15815  
    2626 
    2727 
    28 # PACKAGEDIRS contains the packages that we want to make and install.  It 
    29 # is assumed that each package will have at least four rules: all, install, 
    30 # clean, and distclean. 
     28USE_SQLITE=@USE_SQLITE@ 
    3129USE_Z3950=@USE_Z3950@ 
    3230USE_YAZ=@USE_YAZ@ 
     31 
     32ifeq ($(USE_SQLITE), 1) 
     33SQLITE_DIR = sqlite/sqlite-amalgamation-3.5.9 
     34else 
     35SQLITE_DIR =  
     36endif 
    3337 
    3438ifeq ($(USE_Z3950), 1) 
     
    6064endif 
    6165 
     66# PACKAGEDIRS contains the packages that we want to make and install.  It 
     67# is assumed that each package will have at least four rules: all, install, 
     68# clean, and distclean. 
    6269PACKAGEDIRS =   wv/wv-gs rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \ 
    6370        wget/wget-1.9 expat/ cpan/XML-Parser-2.34 \ 
    64         $(YAZ) $(D2M) $(CORBA) \ 
    65         xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy \ 
    66         sqlite/sqlite-amalgamation-3.5.9 
     71        $(SQLITE_DIR) $(YAZ) $(D2M) $(CORBA) \ 
     72        xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy 
     73 
    6774 
    6875all: 
     
    8895    cd yaz/yaz-2.1.4/src; $(MAKE)  $(MDEFINES) install 
    8996endif 
     97ifeq ($(USE_SQLITE), 1) 
    9098# need to do make install in sqlite to get the header files and library into the right place 
    91     cd sqlite/sqlite-amalgamation-3.5.9 && $(MAKE) $(MDEFINES) install 
     99    cd $(SQLITE_DIR) && $(MAKE) $(MDEFINES) install 
     100endif 
    92101 
    93102