Changeset 15815

Timestamp:

2008-05-30T11:25:14+12:00 (16 years ago)

Author:

mdewsnip

Message:

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

File:

• gsdl/trunk/packages/Makefile.in (modified) (3 diffs)

gsdl/trunk/packages/Makefile.in

@@ -26 +26 @@
 
 
-# PACKAGEDIRS contains the packages that we want to make and install.  It
-# is assumed that each package will have at least four rules: all, install,
-# clean, and distclean.
+USE_SQLITE=@USE_SQLITE@
 USE_Z3950=@USE_Z3950@
 USE_YAZ=@USE_YAZ@
+
+ifeq ($(USE_SQLITE), 1)
+SQLITE_DIR = sqlite/sqlite-amalgamation-3.5.9
+else
+SQLITE_DIR = 
+endif
 
 ifeq ($(USE_Z3950), 1)
@@ -60 +64 @@
 endif
 
+# PACKAGEDIRS contains the packages that we want to make and install.  It
+# is assumed that each package will have at least four rules: all, install,
+# clean, and distclean.
 PACKAGEDIRS =   wv/wv-gs rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \
         wget/wget-1.9 expat/ cpan/XML-Parser-2.34 \
-        $(YAZ) $(D2M) $(CORBA) \
-        xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy \
-        sqlite/sqlite-amalgamation-3.5.9
+        $(SQLITE_DIR) $(YAZ) $(D2M) $(CORBA) \
+        xlhtml/xlhtml-0.4.9.0 isis-gdl html-tidy/tidy
+
 
 all:
@@ -88 +95 @@
     cd yaz/yaz-2.1.4/src; $(MAKE)  $(MDEFINES) install
 endif
+ifeq ($(USE_SQLITE), 1)
 # need to do make install in sqlite to get the header files and library into the right place
-    cd sqlite/sqlite-amalgamation-3.5.9 && $(MAKE) $(MDEFINES) install
+    cd $(SQLITE_DIR) && $(MAKE) $(MDEFINES) install
+endif