Changeset 21519


Ignore:
Timestamp:
2010-01-18T16:56:17+13:00 (13 years ago)
Author:
mdewsnip
Message:

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

Location:
main/trunk/gs2-core
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/gs2-core/common-src/configure

    r21474 r21519  
    814814  --disable-dependency-tracking  speeds up one-time build
    815815  --enable-dependency-tracking   do not reject slow dependency extractors
    816  --enable-sqlite  Enable SQLite support
     816  --disable-sqlite        Disable SQLite support
    817817
    818818Some influential environment variables:
    … …  
    26682668
    26692669
    2670 # Option: SQLite support
     2670# Option: SQLite support (enabled by default)
    26712671# Check whether --enable-sqlite or --disable-sqlite was given.
    26722672if test "${enable_sqlite+set}" = set; then
    26732673  enableval="$enable_sqlite"
    2674   USE_SQLITE=1 &&
     2674
     2675else
     2676  enable_sqlite=yes
     2677fi;
     2678if test "x$enable_sqlite" != xno; then
     2679
    26752680cat >>confdefs.h <<\_ACEOF
    26762681#define USE_SQLITE 1
    26772682_ACEOF
    26782683
    2679 else
    2680   USE_SQLITE=0
    2681 fi;
    2682 
    2683 
    2684 if test "$USE_SQLITE" = 1; then
     2684fi
     2685
     2686
     2687if test "x$enable_sqlite" != xno; then
    26852688  USE_SQLITE_TRUE=
    26862689  USE_SQLITE_FALSE='#'

  • main/trunk/gs2-core/common-src/configure.ac

    r21474 r21519  
    5353AC_SUBST(COMPAT32BITFLAGS)
    5454
    55 # Option: SQLite support
    56 AC_ARG_ENABLE(sqlite, [ --enable-sqlite  Enable SQLite support], USE_SQLITE=1 && AC_DEFINE(USE_SQLITE, 1, [SQLite support]), USE_SQLITE=0)
    57 AM_CONDITIONAL(USE_SQLITE, test "$USE_SQLITE" = 1)
     55# Option: SQLite support (enabled by default)
     56AC_ARG_ENABLE([sqlite], [AS_HELP_STRING([--disable-sqlite], [Disable SQLite support])], [], [enable_sqlite=yes])
     57if test "x$enable_sqlite" != xno; then
     58  AC_DEFINE(USE_SQLITE, 1, [SQLite support])
     59fi
     60AM_CONDITIONAL(USE_SQLITE, test "x$enable_sqlite" != xno)
    5861
    5962# Generate the Makefiles for this package

  • main/trunk/gs2-core/configure

    r21517 r21519  
    816816  --disable-dependency-tracking  speeds up one-time build
    817817  --enable-dependency-tracking   do not reject slow dependency extractors
    818  --enable-sqlite  Enable SQLite support
     818  --disable-sqlite        Disable SQLite support
    819819
    820820Some influential environment variables:
    … …  
    26702670
    26712671
    2672 # Option: SQLite support
     2672# Option: SQLite support (enabled by default)
    26732673# Check whether --enable-sqlite or --disable-sqlite was given.
    26742674if test "${enable_sqlite+set}" = set; then
    26752675  enableval="$enable_sqlite"
    2676   USE_SQLITE=1 &&
     2676
     2677else
     2678  enable_sqlite=yes
     2679fi;
     2680if test "x$enable_sqlite" != xno; then
     2681
    26772682cat >>confdefs.h <<\_ACEOF
    26782683#define USE_SQLITE 1
    26792684_ACEOF
    26802685
    2681 else
    2682   USE_SQLITE=0
    2683 fi;
    2684 
    2685 
    2686 if test "$USE_SQLITE" = 1; then
     2686fi
     2687
     2688
     2689if test "x$enable_sqlite" != xno; then
    26872690  USE_SQLITE_TRUE=
    26882691  USE_SQLITE_FALSE='#'

  • main/trunk/gs2-core/configure.ac

    r21517 r21519  
    5353AC_SUBST(COMPAT32BITFLAGS)
    5454
    55 # Option: SQLite support
    56 AC_ARG_ENABLE(sqlite, [ --enable-sqlite  Enable SQLite support], USE_SQLITE=1 && AC_DEFINE(USE_SQLITE, 1, [SQLite support]), USE_SQLITE=0)
    57 AM_CONDITIONAL(USE_SQLITE, test "$USE_SQLITE" = 1)
     55# Option: SQLite support (enabled by default)
     56AC_ARG_ENABLE([sqlite], [AS_HELP_STRING([--disable-sqlite], [Disable SQLite support])], [], [enable_sqlite=yes])
     57if test "x$enable_sqlite" != xno; then
     58  AC_DEFINE(USE_SQLITE, 1, [SQLite support])
     59fi
     60AM_CONDITIONAL(USE_SQLITE, test "x$enable_sqlite" != xno)
    5861
    5962# Configure the common-src subdirectory

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

    r21505 r21519  
    822822  --disable-dependency-tracking  speeds up one-time build
    823823  --enable-dependency-tracking   do not reject slow dependency extractors
    824  --enable-sqlite  Enable SQLite support
     824  --disable-sqlite        Disable SQLite support
    825825
    826826Some influential environment variables:
    … …  
    35883588
    35893589
    3590 # Option: SQLite support
     3590# Option: SQLite support (enabled by default)
    35913591# Check whether --enable-sqlite or --disable-sqlite was given.
    35923592if test "${enable_sqlite+set}" = set; then
    35933593  enableval="$enable_sqlite"
    3594   USE_SQLITE=1 &&
     3594
     3595else
     3596  enable_sqlite=yes
     3597fi;
     3598if test "x$enable_sqlite" != xno; then
     3599
    35953600cat >>confdefs.h <<\_ACEOF
    35963601#define USE_SQLITE 1
    35973602_ACEOF
    35983603
    3599 else
    3600   USE_SQLITE=0
    3601 fi;
    3602 
    3603 
    3604 if test "$USE_SQLITE" = 1; then
     3604fi
     3605
     3606
     3607if test "x$enable_sqlite" != xno; then
    36053608  USE_SQLITE_TRUE=
    36063609  USE_SQLITE_FALSE='#'

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

    r21505 r21519  
    5656AC_SUBST(COMPAT32BITFLAGS)
    5757
    58 # Option: SQLite support
    59 AC_ARG_ENABLE(sqlite, [ --enable-sqlite  Enable SQLite support], USE_SQLITE=1 && AC_DEFINE(USE_SQLITE, 1, [SQLite support]), USE_SQLITE=0)
    60 AM_CONDITIONAL(USE_SQLITE, test "$USE_SQLITE" = 1)
     58# Option: SQLite support (enabled by default)
     59AC_ARG_ENABLE([sqlite], [AS_HELP_STRING([--disable-sqlite], [Disable SQLite support])], [], [enable_sqlite=yes])
     60if test "x$enable_sqlite" != xno; then
     61  AC_DEFINE(USE_SQLITE, 1, [SQLite support])
     62fi
     63AM_CONDITIONAL(USE_SQLITE, test "x$enable_sqlite" != xno)
    6164
    6265# Generate the Makefiles for this package
Note: See TracChangeset for help on using the changeset viewer.