From dc79d5f6569011ae0987cc66622fbfc137e09450 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 14 May 2010 16:47:23 -0600 Subject: [PATCH] hack configure scripts to avoid warnings --- src/configure | 9 +-------- src/racket/configure.ac | 4 +--- src/racket/gc/libatomic_ops/Makefile.in | 9 +++++---- src/racket/gc/libatomic_ops/configure | 2 ++ 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/configure b/src/configure index c4948a68e5..5552b23f4a 100755 --- a/src/configure +++ b/src/configure @@ -1374,8 +1374,7 @@ Optional Features: --enable-userfw install Mac OS X frameworks to ~/Library/Frameworks --enable-macprefix allow --prefix with a Mac OS X install --enable-mac64 do not force 32-bit build - --enable-multilib no op option to remove error - --enable-gc2-places-testing compile gc2 places tesging support + --enable-gcplacestest compile GC places testing support Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -2043,12 +2042,6 @@ if test "${enable_mac64+set}" = set; then fi -# Check whether --enable-multilib was given. -if test "${enable_multilib+set}" = set; then - enableval=$enable_multilib; -fi - - # Check whether --enable-gc2_places_testing was given. if test "${enable_gc2_places_testing+set}" = set; then enableval=$enable_gc2_places_testing; diff --git a/src/racket/configure.ac b/src/racket/configure.ac index 5e75a1f68d..5db772dedb 100644 --- a/src/racket/configure.ac +++ b/src/racket/configure.ac @@ -79,9 +79,7 @@ AC_ARG_ENABLE(libfw, [ --enable-userfw install Mac OS X frameworks to AC_ARG_ENABLE(macprefix, [ --enable-macprefix allow --prefix with a Mac OS X install]) AC_ARG_ENABLE(mac64, [ --enable-mac64 do not force 32-bit build]) -AC_ARG_ENABLE(multilib, [ --enable-multilib no op option to remove error]) - -AC_ARG_ENABLE(gc2_places_testing, [ --enable-gc2-places-testing compile gc2 places tesging support]) +AC_ARG_ENABLE(gc2_places_testing, [ --enable-gcplacestest compile GC places testing support]) ###### Get OS Type ####### diff --git a/src/racket/gc/libatomic_ops/Makefile.in b/src/racket/gc/libatomic_ops/Makefile.in index fda4bdc6ce..8dd8b64ac0 100644 --- a/src/racket/gc/libatomic_ops/Makefile.in +++ b/src/racket/gc/libatomic_ops/Makefile.in @@ -196,10 +196,11 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +# PLTSCHEME: don't re-run autoconf or aclocal: +# $(top_srcdir)/configure: $(am__configure_deps) +# cd $(srcdir) && $(AUTOCONF) +# $(ACLOCAL_M4): $(am__aclocal_m4_deps) +# cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd diff --git a/src/racket/gc/libatomic_ops/configure b/src/racket/gc/libatomic_ops/configure index 3850086711..85aa52b437 100755 --- a/src/racket/gc/libatomic_ops/configure +++ b/src/racket/gc/libatomic_ops/configure @@ -703,6 +703,8 @@ CCAS CCASFLAGS CPP' +# PLTSCHEME: hack to supress a warning: +enable_option_checking=no # Initialize some variables set by options. ac_init_help=