/ Check-in [43ce3bd3]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix an issue with OPT_FEATURE_FLAGS in configure.ac.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:43ce3bd3a4b41ea757e308e563d6c1bf7f9c09f10e4766c536d0bf1042c45613
User & Date: drh 2017-05-29 17:43:06
Context
2017-06-08
11:32
Fix an issue with OPT_FEATURE_FLAGS in configure.ac. check-in: 97b5c4a5 user: drh tags: branch-3.19
2017-05-29
17:59
Omit unnecessary fstat() calls for determining the database file size, resulting in smaller and faster code. check-in: dd61c736 user: drh tags: trunk
17:43
Fix an issue with OPT_FEATURE_FLAGS in configure.ac. check-in: 43ce3bd3 user: drh tags: trunk
14:30
Fix a typo in a comment. No code changes. check-in: cb29b838 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to configure.

 11352  11352   else
 11353  11353     enable_memsys5=no
 11354  11354   fi
 11355  11355   
 11356  11356   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS5" >&5
 11357  11357   $as_echo_n "checking whether to support MEMSYS5... " >&6; }
 11358  11358   if test "${enable_memsys5}" = "yes"; then
 11359         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MEMSYS5"
        11359  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS5"
 11360  11360     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 11361  11361   $as_echo "yes" >&6; }
 11362  11362   else
 11363  11363     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 11364  11364   $as_echo "no" >&6; }
 11365  11365   fi
 11366  11366   # Check whether --enable-memsys3 was given.
................................................................................
 11369  11369   else
 11370  11370     enable_memsys3=no
 11371  11371   fi
 11372  11372   
 11373  11373   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS3" >&5
 11374  11374   $as_echo_n "checking whether to support MEMSYS3... " >&6; }
 11375  11375   if test "${enable_memsys3}" = "yes" -a "${enable_memsys5}" = "no"; then
 11376         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MEMSYS3"
        11376  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS3"
 11377  11377     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 11378  11378   $as_echo "yes" >&6; }
 11379  11379   else
 11380  11380     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 11381  11381   $as_echo "no" >&6; }
 11382  11382   fi
 11383  11383   
................................................................................
 11387  11387   if test "${enable_fts3+set}" = set; then :
 11388  11388     enableval=$enable_fts3; enable_fts3=yes
 11389  11389   else
 11390  11390     enable_fts3=no
 11391  11391   fi
 11392  11392   
 11393  11393   if test "${enable_fts3}" = "yes" ; then
 11394         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3"
        11394  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS3"
 11395  11395   fi
 11396  11396   # Check whether --enable-fts4 was given.
 11397  11397   if test "${enable_fts4+set}" = set; then :
 11398  11398     enableval=$enable_fts4; enable_fts4=yes
 11399  11399   else
 11400  11400     enable_fts4=no
 11401  11401   fi
 11402  11402   
 11403  11403   if test "${enable_fts4}" = "yes" ; then
 11404         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS4"
        11404  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS4"
 11405  11405     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5
 11406  11406   $as_echo_n "checking for library containing log... " >&6; }
 11407  11407   if ${ac_cv_search_log+:} false; then :
 11408  11408     $as_echo_n "(cached) " >&6
 11409  11409   else
 11410  11410     ac_func_search_save_LIBS=$LIBS
 11411  11411   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
................................................................................
 11463  11463   if test "${enable_fts5+set}" = set; then :
 11464  11464     enableval=$enable_fts5; enable_fts5=yes
 11465  11465   else
 11466  11466     enable_fts5=no
 11467  11467   fi
 11468  11468   
 11469  11469   if test "${enable_fts5}" = "yes" ; then
 11470         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS5"
        11470  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS5"
 11471  11471     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5
 11472  11472   $as_echo_n "checking for library containing log... " >&6; }
 11473  11473   if ${ac_cv_search_log+:} false; then :
 11474  11474     $as_echo_n "(cached) " >&6
 11475  11475   else
 11476  11476     ac_func_search_save_LIBS=$LIBS
 11477  11477   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
................................................................................
 11532  11532   if test "${enable_json1+set}" = set; then :
 11533  11533     enableval=$enable_json1; enable_json1=yes
 11534  11534   else
 11535  11535     enable_json1=no
 11536  11536   fi
 11537  11537   
 11538  11538   if test "${enable_json1}" = "yes" ; then
 11539         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1"
        11539  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_JSON1"
 11540  11540   fi
 11541  11541   
 11542  11542   #########
 11543  11543   # See whether we should enable RTREE
 11544  11544   # Check whether --enable-rtree was given.
 11545  11545   if test "${enable_rtree+set}" = set; then :
 11546  11546     enableval=$enable_rtree; enable_rtree=yes
 11547  11547   else
 11548  11548     enable_rtree=no
 11549  11549   fi
 11550  11550   
 11551  11551   if test "${enable_rtree}" = "yes" ; then
 11552         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE"
        11552  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_RTREE"
 11553  11553   fi
 11554  11554   
 11555  11555   #########
 11556  11556   # See whether we should enable the SESSION extension
 11557  11557   # Check whether --enable-session was given.
 11558  11558   if test "${enable_session+set}" = set; then :
 11559  11559     enableval=$enable_session; enable_session=yes
 11560  11560   else
 11561  11561     enable_session=no
 11562  11562   fi
 11563  11563   
 11564  11564   if test "${enable_session}" = "yes" ; then
 11565         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION"
 11566         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK"
        11565  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_SESSION"
        11566  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_PREUPDATE_HOOK"
 11567  11567   fi
 11568  11568   
 11569  11569   #########
 11570         -# attempt to duplicate any OMITS and ENABLES into the $(OPT_FEATURE_FLAGS) parameter
        11570  +# attempt to duplicate any OMITS and ENABLES into the ${OPT_FEATURE_FLAGS} parameter
 11571  11571   for option in $CFLAGS $CPPFLAGS
 11572  11572   do
 11573  11573     case $option in
 11574  11574       -DSQLITE_OMIT*) OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS $option";;
 11575  11575       -DSQLITE_ENABLE*) OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS $option";;
 11576  11576     esac
 11577  11577   done

Changes to configure.ac.

   592    592   # Do we want to support memsys3 and/or memsys5
   593    593   #
   594    594   AC_ARG_ENABLE(memsys5, 
   595    595     AC_HELP_STRING([--enable-memsys5],[Enable MEMSYS5]),
   596    596     [enable_memsys5=yes],[enable_memsys5=no])
   597    597   AC_MSG_CHECKING([whether to support MEMSYS5])
   598    598   if test "${enable_memsys5}" = "yes"; then
   599         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MEMSYS5"
          599  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS5"
   600    600     AC_MSG_RESULT([yes])
   601    601   else
   602    602     AC_MSG_RESULT([no])
   603    603   fi
   604    604   AC_ARG_ENABLE(memsys3, 
   605    605     AC_HELP_STRING([--enable-memsys3],[Enable MEMSYS3]),
   606    606     [enable_memsys3=yes],[enable_memsys3=no])
   607    607   AC_MSG_CHECKING([whether to support MEMSYS3])
   608    608   if test "${enable_memsys3}" = "yes" -a "${enable_memsys5}" = "no"; then
   609         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MEMSYS3"
          609  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS3"
   610    610     AC_MSG_RESULT([yes])
   611    611   else
   612    612     AC_MSG_RESULT([no])
   613    613   fi
   614    614   
   615    615   #########
   616    616   # See whether we should enable Full Text Search extensions
   617    617   AC_ARG_ENABLE(fts3, AC_HELP_STRING([--enable-fts3],
   618    618         [Enable the FTS3 extension]),
   619    619         [enable_fts3=yes],[enable_fts3=no])
   620    620   if test "${enable_fts3}" = "yes" ; then
   621         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3"
          621  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS3"
   622    622   fi
   623    623   AC_ARG_ENABLE(fts4, AC_HELP_STRING([--enable-fts4],
   624    624         [Enable the FTS4 extension]),
   625    625         [enable_fts4=yes],[enable_fts4=no])
   626    626   if test "${enable_fts4}" = "yes" ; then
   627         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS4"
          627  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS4"
   628    628     AC_SEARCH_LIBS([log],[m])
   629    629   fi
   630    630   AC_ARG_ENABLE(fts5, AC_HELP_STRING([--enable-fts5],
   631    631         [Enable the FTS5 extension]),
   632    632         [enable_fts5=yes],[enable_fts5=no])
   633    633   if test "${enable_fts5}" = "yes" ; then
   634         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS5"
          634  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS5"
   635    635     AC_SEARCH_LIBS([log],[m])
   636    636   fi
   637    637   
   638    638   #########
   639    639   # See whether we should enable JSON1
   640    640   AC_ARG_ENABLE(json1, AC_HELP_STRING([--enable-json1],
   641    641         [Enable the JSON1 extension]),
   642    642         [enable_json1=yes],[enable_json1=no])
   643    643   if test "${enable_json1}" = "yes" ; then
   644         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1"
          644  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_JSON1"
   645    645   fi
   646    646   
   647    647   #########
   648    648   # See whether we should enable RTREE
   649    649   AC_ARG_ENABLE(rtree, AC_HELP_STRING([--enable-rtree],
   650    650         [Enable the RTREE extension]),
   651    651         [enable_rtree=yes],[enable_rtree=no])
   652    652   if test "${enable_rtree}" = "yes" ; then
   653         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE"
          653  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_RTREE"
   654    654   fi
   655    655   
   656    656   #########
   657    657   # See whether we should enable the SESSION extension
   658    658   AC_ARG_ENABLE(session, AC_HELP_STRING([--enable-session],
   659    659         [Enable the SESSION extension]),
   660    660         [enable_session=yes],[enable_session=no])
   661    661   if test "${enable_session}" = "yes" ; then
   662         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION"
   663         -  OPT_FEATURE_FLAGS="$(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK"
          662  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_SESSION"
          663  +  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_PREUPDATE_HOOK"
   664    664   fi
   665    665   
   666    666   #########
   667         -# attempt to duplicate any OMITS and ENABLES into the $(OPT_FEATURE_FLAGS) parameter
          667  +# attempt to duplicate any OMITS and ENABLES into the ${OPT_FEATURE_FLAGS} parameter
   668    668   for option in $CFLAGS $CPPFLAGS
   669    669   do
   670    670     case $option in
   671    671       -DSQLITE_OMIT*) OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS $option";;
   672    672       -DSQLITE_ENABLE*) OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS $option";;
   673    673     esac
   674    674   done