/ Check-in [67955255]
Login

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

Overview
Comment:Fix the --enable-memsysN options in configure so that they actually work.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 679552550e085497b98478bbe28056d99fe4aab4
User & Date: drh 2016-07-25 11:32:09
Context
2016-07-25
11:39
Another attempt at getting --enable-memsysN working. check-in: 5f40e6ad user: drh tags: trunk
11:32
Fix the --enable-memsysN options in configure so that they actually work. check-in: 67955255 user: drh tags: trunk
11:27
Add --enable-memsys3 and --enable-memsys5 options to the configure script. check-in: 67e1dc98 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to configure.

 11345  11345   fi
 11346  11346   
 11347  11347   ##########
 11348  11348   # Do we want to support memsys3 and/or memsys5
 11349  11349   #
 11350  11350   # Check whether --enable-memsys3 was given.
 11351  11351   if test "${enable_memsys3+set}" = set; then :
 11352         -  enableval=$enable_memsys3;
        11352  +  enableval=$enable_memsys3; enable_memsys3=yes
 11353  11353   else
 11354         -  enable_memsys3=yes
        11354  +  enable_memsys3=no
 11355  11355   fi
 11356  11356   
 11357  11357   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS3" >&5
 11358  11358   $as_echo_n "checking whether to support MEMSYS3... " >&6; }
 11359         -if test "$enable_memsys3" = "yes"; then
        11359  +if test "${enable_memsys3}" = "yes"; then
 11360  11360     SQLITE_ENABLE_MEMSYS3=1
 11361  11361     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 11362  11362   $as_echo "yes" >&6; }
 11363  11363   else
 11364  11364     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 11365  11365   $as_echo "no" >&6; }
 11366  11366   fi
 11367  11367   
 11368  11368   # Check whether --enable-memsys5 was given.
 11369  11369   if test "${enable_memsys5+set}" = set; then :
 11370         -  enableval=$enable_memsys5;
        11370  +  enableval=$enable_memsys5; enable_memsys5=yes
 11371  11371   else
 11372         -  enable_memsys3=yes
        11372  +  enable_memsys5=no
 11373  11373   fi
 11374  11374   
 11375  11375   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS5" >&5
 11376  11376   $as_echo_n "checking whether to support MEMSYS5... " >&6; }
 11377         -if test "$enable_memsys5" = "yes"; then
        11377  +if test "${enable_memsys5}" = "yes"; then
 11378  11378     SQLITE_ENABLE_MEMSYS5=1
 11379  11379     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 11380  11380   $as_echo "yes" >&6; }
 11381  11381   else
 11382  11382     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 11383  11383   $as_echo "no" >&6; }
 11384  11384   fi

Changes to configure.ac.

   588    588     OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
   589    589   fi
   590    590   
   591    591   ##########
   592    592   # Do we want to support memsys3 and/or memsys5
   593    593   #
   594    594   AC_ARG_ENABLE(memsys3, 
   595         -AC_HELP_STRING([--enable-memsys3],[Enable MEMSYS3]),,enable_memsys3=yes)
          595  +  AC_HELP_STRING([--enable-memsys3],[Enable MEMSYS3]),
          596  +  [enable_memsys3=yes],[enable_memsys3=no])
   596    597   AC_MSG_CHECKING([whether to support MEMSYS3])
   597         -if test "$enable_memsys3" = "yes"; then
          598  +if test "${enable_memsys3}" = "yes"; then
   598    599     SQLITE_ENABLE_MEMSYS3=1
   599    600     AC_MSG_RESULT([yes])
   600    601   else
   601    602     AC_MSG_RESULT([no])
   602    603   fi
   603    604   AC_SUBST(SQLITE_MEMSYS5)
   604    605   AC_ARG_ENABLE(memsys5, 
   605         -AC_HELP_STRING([--enable-memsys5],[Enable MEMSYS5]),,enable_memsys3=yes)
          606  +  AC_HELP_STRING([--enable-memsys5],[Enable MEMSYS5]),
          607  +  [enable_memsys5=yes],[enable_memsys5=no])
   606    608   AC_MSG_CHECKING([whether to support MEMSYS5])
   607         -if test "$enable_memsys5" = "yes"; then
          609  +if test "${enable_memsys5}" = "yes"; then
   608    610     SQLITE_ENABLE_MEMSYS5=1
   609    611     AC_MSG_RESULT([yes])
   610    612   else
   611    613     AC_MSG_RESULT([no])
   612    614   fi
   613    615   AC_SUBST(SQLITE_MEMSYS5)
   614    616