Changeset 15901

Timestamp:

2008-06-09T12:02:28+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Forgot to add recent changes to configure.in.

Location:

gsdl/trunk

Files:

• configure (modified) (3 diffs)
• configure.in (modified) (3 diffs)

gsdl/trunk/configure

@@ -856 +856 @@
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-corba          Enable CORBA support
-  --enable-sqlite         Enable SQLite support
   --enable-z3950          Enable Z39.50 client support
   --disable-yaz           Disable YAZ compilation
   --disable-accentfold    Disable Accent Folding for MGPP
+  --enable-sqlite         Enable SQLite support
 
 Optional Packages:
@@ -1426 +1426 @@
 
 
+
 # Check whether --enable-sqlite or --disable-sqlite was given.
 if test "${enable_sqlite+set}" = set; then
@@ -1436 +1437 @@
 #define USE_SQLITE $USE_SQLITE
 _ACEOF
+
 
 

gsdl/trunk/configure.in

@@ -53 +53 @@
 dnl Set use of yaz - now compiled by default even when z3950 support not required
 dnl
-AC_ARG_ENABLE(yaz, [  --disable-yaz          Disable YAZ compilation], USE_YAZ=0, USE_YAZ=1)
+AC_ARG_ENABLE(yaz, [  --disable-yaz           Disable YAZ compilation], USE_YAZ=0, USE_YAZ=1)
 dnl if test USE_YAZ = 1; then
 AC_DEFINE(USE_YAZ, $USE_YAZ)
@@ -67 +67 @@
 dnl disable compilation of accent folding stuff for mgpp (and one day mg)
 dnl
-AC_ARG_ENABLE(accentfold, [  --disable-accentfold          Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=0, ENABLE_ACCENTFOLD=1)
+AC_ARG_ENABLE(accentfold, [  --disable-accentfold    Disable Accent Folding for MGPP], ENABLE_ACCENTFOLD=0, ENABLE_ACCENTFOLD=1)
 AC_DEFINE(ENABLE_ACCENTFOLD, $ENABLE_ACCENTFOLD)
 AC_SUBST(ENABLE_ACCENTFOLD)
+
+dnl
+dnl Set use of SQLite
+dnl
+AC_ARG_ENABLE(sqlite, [  --enable-sqlite         Enable SQLite support], USE_SQLITE=1, USE_SQLITE=0)
+AC_DEFINE(USE_SQLITE, $USE_SQLITE)
+AC_SUBST(USE_SQLITE)
 
 dnl Checks for programs.
@@ -450 +457 @@
 
 # the list of folders in the src folder
-srclist="src/hashfile/Makefile src/colservr/Makefile src/recpt/Makefile src/gdbmedit/txt2db/Makefile \
-          src/oaiservr/Makefile src/gdbmedit/db2txt/Makefile src/getpw/Makefile src/phind/generate/Makefile"
+srclist="src/hashfile/Makefile src/colservr/Makefile src/corba/Makefile src/protocol/Makefile src/recpt/Makefile src/gdbmedit/txt2db/Makefile \
+          src/oaiservr/Makefile src/z3950/Makefile src/gdbmedit/db2txt/Makefile src/getpw/Makefile src/phind/generate/Makefile"
 
 AC_OUTPUT(packages/Makefile lib/Makefile Makefile $srclist $moduleDirs)