From 5c1529d66d48e75705e9080d872e3fec2cbfd97b Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Fri, 14 May 2010 11:27:32 -0600 Subject: [PATCH] Fixing configure error outputs --- src/configure | 13 ++++++++++--- src/racket/configure.ac | 4 +++- src/racket/gc/libatomic_ops/Makefile.in | 1 + src/racket/gc/libatomic_ops/doc/Makefile.in | 1 + src/racket/gc/libatomic_ops/src/Makefile.in | 1 + .../gc/libatomic_ops/src/atomic_ops/Makefile.in | 1 + src/racket/gc/libatomic_ops/tests/Makefile.in | 1 + 7 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/configure b/src/configure index f9df9e09a3..c4948a68e5 100755 --- a/src/configure +++ b/src/configure @@ -1374,6 +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 Optional Packages: @@ -2010,9 +2011,9 @@ if test "${enable_noopt+set}" = set; then fi -# Check whether --enable-noopt was given. -if test "${enable_noopt+set}" = set; then - enableval=$enable_noopt; +# Check whether --enable-enable_sdk was given. +if test "${enable_enable_sdk+set}" = set; then + enableval=$enable_enable_sdk; fi @@ -2042,6 +2043,12 @@ 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 a2a61cf556..5e75a1f68d 100644 --- a/src/racket/configure.ac +++ b/src/racket/configure.ac @@ -71,7 +71,7 @@ AC_ARG_ENABLE(gcov, [ --enable-gcov compile to gather gcov statist AC_ARG_ENABLE(noopt, [ --enable-noopt drop -O C flags]) -AC_ARG_ENABLE(noopt, [ --enable-sdk= use Mac OS X 10.4 SDK directory]) +AC_ARG_ENABLE(enable_sdk, [ --enable-sdk= use Mac OS X 10.4 SDK directory]) AC_ARG_ENABLE(xonx, [ --enable-xonx compile X11 (not Quartz) GRacket for Mac OS X]) AC_ARG_ENABLE(libfw, [ --enable-libfw install Mac OS X frameworks to /Library/Frameworks]) @@ -79,6 +79,8 @@ 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]) ###### Get OS Type ####### diff --git a/src/racket/gc/libatomic_ops/Makefile.in b/src/racket/gc/libatomic_ops/Makefile.in index 8766159c7d..fda4bdc6ce 100644 --- a/src/racket/gc/libatomic_ops/Makefile.in +++ b/src/racket/gc/libatomic_ops/Makefile.in @@ -137,6 +137,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ diff --git a/src/racket/gc/libatomic_ops/doc/Makefile.in b/src/racket/gc/libatomic_ops/doc/Makefile.in index f0eb954edf..25698cf39b 100644 --- a/src/racket/gc/libatomic_ops/doc/Makefile.in +++ b/src/racket/gc/libatomic_ops/doc/Makefile.in @@ -124,6 +124,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ diff --git a/src/racket/gc/libatomic_ops/src/Makefile.in b/src/racket/gc/libatomic_ops/src/Makefile.in index 81e8023f5f..7fb27de571 100644 --- a/src/racket/gc/libatomic_ops/src/Makefile.in +++ b/src/racket/gc/libatomic_ops/src/Makefile.in @@ -161,6 +161,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ diff --git a/src/racket/gc/libatomic_ops/src/atomic_ops/Makefile.in b/src/racket/gc/libatomic_ops/src/atomic_ops/Makefile.in index 33e8123265..8e5fb911d1 100644 --- a/src/racket/gc/libatomic_ops/src/atomic_ops/Makefile.in +++ b/src/racket/gc/libatomic_ops/src/atomic_ops/Makefile.in @@ -133,6 +133,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ diff --git a/src/racket/gc/libatomic_ops/tests/Makefile.in b/src/racket/gc/libatomic_ops/tests/Makefile.in index 6823633282..ff78742861 100644 --- a/src/racket/gc/libatomic_ops/tests/Makefile.in +++ b/src/racket/gc/libatomic_ops/tests/Makefile.in @@ -143,6 +143,7 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@