Changeset 21519 for main/trunk/gs2-core/runtime-src

Timestamp:

2010-01-18T16:56:17+13:00 (14 years ago)

Author:

mdewsnip

Message:

Fixing up inclusion/exclusion of SQLite support, and changing default to be included.

Location:

main/trunk/gs2-core/runtime-src

Files:

• configure (modified) (2 diffs)
• configure.ac (modified) (1 diff)

main/trunk/gs2-core/runtime-src/configure

@@ -822 +822 @@
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
- --enable-sqlite  Enable SQLite support
+  --disable-sqlite        Disable SQLite support
 
 Some influential environment variables:
@@ -3588 +3588 @@
 
 
-# Option: SQLite support
+# Option: SQLite support (enabled by default)
 # Check whether --enable-sqlite or --disable-sqlite was given.
 if test "${enable_sqlite+set}" = set; then
   enableval="$enable_sqlite"
-  USE_SQLITE=1 &&
+
+else
+  enable_sqlite=yes
+fi;
+if test "x$enable_sqlite" != xno; then
+
 cat >>confdefs.h <<\_ACEOF
 #define USE_SQLITE 1
 _ACEOF
 
-else
-  USE_SQLITE=0
-fi;
-
-
-if test "$USE_SQLITE" = 1; then
+fi
+
+
+if test "x$enable_sqlite" != xno; then
   USE_SQLITE_TRUE=
   USE_SQLITE_FALSE='#'

main/trunk/gs2-core/runtime-src/configure.ac

@@ -56 +56 @@
 AC_SUBST(COMPAT32BITFLAGS)
 
-# Option: SQLite support
-AC_ARG_ENABLE(sqlite, [ --enable-sqlite  Enable SQLite support], USE_SQLITE=1 && AC_DEFINE(USE_SQLITE, 1, [SQLite support]), USE_SQLITE=0)
-AM_CONDITIONAL(USE_SQLITE, test "$USE_SQLITE" = 1)
+# Option: SQLite support (enabled by default)
+AC_ARG_ENABLE([sqlite], [AS_HELP_STRING([--disable-sqlite], [Disable SQLite support])], [], [enable_sqlite=yes])
+if test "x$enable_sqlite" != xno; then
+  AC_DEFINE(USE_SQLITE, 1, [SQLite support])
+fi
+AM_CONDITIONAL(USE_SQLITE, test "x$enable_sqlite" != xno)
 
 # Generate the Makefiles for this package