Changeset 21474

Show
Ignore:
Timestamp:
15.01.2010 15:31:34 (9 years ago)
Author:
mdewsnip
Message:

Changed the SQLite configure stuff so USE_SQLITE is only defined if it is enabled (and undefined if it is disabled). This is required because the C++ code just uses "#ifdef USE_SQLITE", and previously this was always defined.

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

Legend:

Unmodified
Added
Removed
  • main/trunk/gs2-core/common-src/configure

    r21467 r21474  
    26722672if test "${enable_sqlite+set}" = set; then 
    26732673  enableval="$enable_sqlite" 
    2674   USE_SQLITE=1 
     2674  USE_SQLITE=1 && 
     2675cat >>confdefs.h <<\_ACEOF 
     2676#define USE_SQLITE 1 
     2677_ACEOF 
     2678 
    26752679else 
    26762680  USE_SQLITE=0 
    26772681fi; 
    2678  
    2679 cat >>confdefs.h <<_ACEOF 
    2680 #define USE_SQLITE $USE_SQLITE 
    2681 _ACEOF 
    2682  
    26832682 
    26842683 
  • main/trunk/gs2-core/common-src/configure.ac

    r21467 r21474  
    5454 
    5555# Option: SQLite support 
    56 AC_ARG_ENABLE(sqlite, [ --enable-sqlite  Enable SQLite support], USE_SQLITE=1, USE_SQLITE=0) 
    57 AC_DEFINE_UNQUOTED([USE_SQLITE], $USE_SQLITE, [SQLite support]) 
     56AC_ARG_ENABLE(sqlite, [ --enable-sqlite  Enable SQLite support], USE_SQLITE=1 && AC_DEFINE(USE_SQLITE, 1, [SQLite support]), USE_SQLITE=0) 
    5857AM_CONDITIONAL(USE_SQLITE, test "$USE_SQLITE" = 1) 
    5958 
  • main/trunk/gs2-core/configure

    r21468 r21474  
    26722672if test "${enable_sqlite+set}" = set; then 
    26732673  enableval="$enable_sqlite" 
    2674   USE_SQLITE=1 
     2674  USE_SQLITE=1 && 
     2675cat >>confdefs.h <<\_ACEOF 
     2676#define USE_SQLITE 1 
     2677_ACEOF 
     2678 
    26752679else 
    26762680  USE_SQLITE=0 
    26772681fi; 
    2678  
    2679 cat >>confdefs.h <<_ACEOF 
    2680 #define USE_SQLITE $USE_SQLITE 
    2681 _ACEOF 
    2682  
    26832682 
    26842683 
  • main/trunk/gs2-core/configure.ac

    r21468 r21474  
    5454 
    5555# Option: SQLite support 
    56 AC_ARG_ENABLE(sqlite, [ --enable-sqlite  Enable SQLite support], USE_SQLITE=1, USE_SQLITE=0) 
    57 AC_DEFINE_UNQUOTED([USE_SQLITE], $USE_SQLITE, [SQLite support]) 
     56AC_ARG_ENABLE(sqlite, [ --enable-sqlite  Enable SQLite support], USE_SQLITE=1 && AC_DEFINE(USE_SQLITE, 1, [SQLite support]), USE_SQLITE=0) 
    5857AM_CONDITIONAL(USE_SQLITE, test "$USE_SQLITE" = 1) 
    5958 
  • main/trunk/gs2-core/runtime-src/configure

    r21473 r21474  
    26722672if test "${enable_sqlite+set}" = set; then 
    26732673  enableval="$enable_sqlite" 
    2674   USE_SQLITE=1 
     2674  USE_SQLITE=1 && 
     2675cat >>confdefs.h <<\_ACEOF 
     2676#define USE_SQLITE 1 
     2677_ACEOF 
     2678 
    26752679else 
    26762680  USE_SQLITE=0 
    26772681fi; 
    2678  
    2679 cat >>confdefs.h <<_ACEOF 
    2680 #define USE_SQLITE $USE_SQLITE 
    2681 _ACEOF 
    2682  
    26832682 
    26842683 
  • main/trunk/gs2-core/runtime-src/configure.ac

    r21473 r21474  
    5454 
    5555# Option: SQLite support 
    56 AC_ARG_ENABLE(sqlite, [ --enable-sqlite  Enable SQLite support], USE_SQLITE=1, USE_SQLITE=0) 
    57 AC_DEFINE_UNQUOTED([USE_SQLITE], $USE_SQLITE, [SQLite support]) 
     56AC_ARG_ENABLE(sqlite, [ --enable-sqlite  Enable SQLite support], USE_SQLITE=1 && AC_DEFINE(USE_SQLITE, 1, [SQLite support]), USE_SQLITE=0) 
    5857AM_CONDITIONAL(USE_SQLITE, test "$USE_SQLITE" = 1) 
    5958