[racket-dev] [plt] Push #22482: master branch updated

It looks like places and futures have been combined into a single
'parallel' variable within configure, so does it make sense to have both
--enable-places and --enable-futures instead of --enable-parallel ?

On 04/19/2011 09:27 AM, tewk at racket-lang.org wrote:
> tewk has updated `master' from 7389eef5b2 to 4fd6144e3d.
>   http://git.racket-lang.org/plt/7389eef5b2..4fd6144e3d
>
> =====[ 1 Commits ]======================================================
>
> Directory summary:
>   43.2% src/racket/
>    7.6% src/worksp/
>   49.0% src/
>
> ~~~~~~~~~~
>
> 4fd6144 Kevin Tew <tewk at racket-lang.org> 2011-04-19 09:05
> :
> | [Places] place are now turned on by default
> :
>   M src/configure           |   20 ++++++++++++++------
>   M src/racket/configure.ac |   20 ++++++++++++++------
>   M src/worksp/mzconfig.h   |    2 +-
>
> =====[ Overall Diff ]===================================================
>
> src/configure
> ~~~~~~~~~~~~~
> --- OLD/src/configure
> +++ NEW/src/configure
> @@ -1327,7 +1327,7 @@ Optional Features:
>    --enable-jit            compile JIT support (enabled by default)
>    --enable-foreign        compile foreign support (enabled by default)
>    --enable-libffi         use installed libffi (enabled by default)
> -  --enable-places         compile places support
> +  --enable-places         compile places support (usually enabled by default)
>    --enable-futures        compile futures support (usually enabled by default)
>    --enable-cgcdefault     use CGC (Boehm or Senora) as default build
>    --enable-sgc            use Senora GC instead of the Boehm GC
> @@ -2216,10 +2216,12 @@ show_explicitly_disabled "${enable_foreign}" Foreign
>  show_explicitly_disabled "${enable_libffi}" "Installed libffi"
>  
>  show_explicitly_enabled "${enable_places}" Places
> -show_explicitly_enabled "${enable_gc2_places_testing}" "GC2 Places Testing"
> +show_explicitly_disabled "${enable_places}" Places
>  show_explicitly_enabled "${enable_futures}" Futures
>  show_explicitly_disabled "${enable_futures}" Futures
>  
> +show_explicitly_enabled "${enable_gc2_places_testing}" "GC2 Places Testing"
> +
>  show_explicitly_enabled "${enable_sgc}" SGC
>  show_explicitly_enabled "${enable_sgcdebug}" "SGC debug mode"
>  show_explicitly_enabled "${enable_compact}" "Compact 3m GC"
> @@ -3907,7 +3909,7 @@ case $OS in
>      case `$UNAME -m` in
>        #Required for CentOS 4.6
>        x86_64)
> -       enable_futures_by_default=yes
> +       enable_parallel_by_default=yes
>         CGC_X86_64="1"
>         ;;
>        ppc)
> @@ -3917,7 +3919,7 @@ case $OS in
>         EXTRA_GMP_DEP='$(EXTRA_GMP_DEP_FILE)'
>         ;;
>        i386|i486|i586|i686)
> -       enable_futures_by_default=yes
> +       enable_parallel_by_default=yes
>         ;;
>        *)
>         ;;
> @@ -3979,7 +3981,7 @@ case $OS in
>  
>      case "`$UNAME -m`" in
>        i386|x86_64)
> -       enable_futures_by_default=yes
> +       enable_parallel_by_default=yes
>         ;;
>        *)
>         ;;
> @@ -8253,6 +8255,12 @@ fi
>  
>  ############### places ###################
>  
> +if test "${enable_parallel_by_default}" = "yes" ; then
> +  if test "${enable_places}" = "" ; then
> +    enable_places=yes
> +  fi
> +fi
> +
>  if test "${enable_places}" = "yes" ; then
>  
>  cat >>confdefs.h <<\_ACEOF
> @@ -8264,7 +8272,7 @@ fi
>  
>  ############### futures ###################
>  
> -if test "${enable_futures_by_default}" = "yes" ; then
> +if test "${enable_parallel_by_default}" = "yes" ; then
>    if test "${enable_futures}" = "" ; then
>      enable_futures=yes
>    fi
>
> src/racket/configure.ac
> ~~~~~~~~~~~~~~~~~~~~~~~
> --- OLD/src/racket/configure.ac
> +++ NEW/src/racket/configure.ac
> @@ -38,7 +38,7 @@ AC_ARG_ENABLE(jit,     [  --enable-jit            compile JIT support (enabled b
>  AC_ARG_ENABLE(foreign, [  --enable-foreign        compile foreign support (enabled by default)], , enable_foreign=yes)
>  AC_ARG_ENABLE(libffi,  [  --enable-libffi         use installed libffi (enabled by default)], , enable_libffi=yes)
>  
> -AC_ARG_ENABLE(places,  [  --enable-places         compile places support])
> +AC_ARG_ENABLE(places,  [  --enable-places         compile places support (usually enabled by default)])
>  AC_ARG_ENABLE(futures, [  --enable-futures        compile futures support (usually enabled by default)])
>  
>  AC_ARG_ENABLE(cgcdefault, [  --enable-cgcdefault     use CGC (Boehm or Senora) as default build])
> @@ -283,10 +283,12 @@ show_explicitly_disabled "${enable_foreign}" Foreign
>  show_explicitly_disabled "${enable_libffi}" "Installed libffi"
>  
>  show_explicitly_enabled "${enable_places}" Places
> -show_explicitly_enabled "${enable_gc2_places_testing}" "GC2 Places Testing"
> +show_explicitly_disabled "${enable_places}" Places
>  show_explicitly_enabled "${enable_futures}" Futures
>  show_explicitly_disabled "${enable_futures}" Futures
>  
> +show_explicitly_enabled "${enable_gc2_places_testing}" "GC2 Places Testing"
> +
>  show_explicitly_enabled "${enable_sgc}" SGC
>  show_explicitly_enabled "${enable_sgcdebug}" "SGC debug mode"
>  show_explicitly_enabled "${enable_compact}" "Compact 3m GC"
> @@ -540,7 +542,7 @@ case $OS in
>      case `$UNAME -m` in
>        #Required for CentOS 4.6
>        x86_64)
> -       enable_futures_by_default=yes
> +       enable_parallel_by_default=yes
>         CGC_X86_64="1"
>         ;;
>        ppc)
> @@ -550,7 +552,7 @@ case $OS in
>         EXTRA_GMP_DEP='$(EXTRA_GMP_DEP_FILE)'
>         ;;
>        i386|i486|i586|i686)
> -       enable_futures_by_default=yes
> +       enable_parallel_by_default=yes
>         ;;
>        *)
>         ;;
> @@ -612,7 +614,7 @@ case $OS in
>      
>      case "`$UNAME -m`" in
>        i386|x86_64)
> -       enable_futures_by_default=yes
> +       enable_parallel_by_default=yes
>         ;;
>        *)
>         ;;
> @@ -1004,6 +1006,12 @@ fi
>  
>  ############### places ###################
>  
> +if test "${enable_parallel_by_default}" = "yes" ; then
> +  if test "${enable_places}" = "" ; then
> +    enable_places=yes
> +  fi
> +fi
> +
>  if test "${enable_places}" = "yes" ; then
>    AC_DEFINE(MZ_USE_PLACES,1,[Places enabled])
>    enable_mzrt=yes
> @@ -1011,7 +1019,7 @@ fi
>  
>  ############### futures ###################
>  
> -if test "${enable_futures_by_default}" = "yes" ; then
> +if test "${enable_parallel_by_default}" = "yes" ; then
>    if test "${enable_futures}" = "" ; then
>      enable_futures=yes
>    fi
>
> src/worksp/mzconfig.h
> ~~~~~~~~~~~~~~~~~~~~~
> --- OLD/src/worksp/mzconfig.h
> +++ NEW/src/worksp/mzconfig.h
> @@ -42,7 +42,7 @@
>  #define MZ_USE_FUTURES
>  
>  /* Enable places: */
> -/* #define MZ_USE_PLACES */
> +#define MZ_USE_PLACES
>  
>  /* Enable single-precision floats: */
>  #define USE_SINGLE_FLOATS