diff --git a/racket/src/configure b/racket/src/configure index af9550f030..96711f02cf 100755 --- a/racket/src/configure +++ b/racket/src/configure @@ -803,6 +803,7 @@ enable_natipkg enable_shared enable_dynlib enable_lt +enable_libs enable_libffi enable_sdk enable_xonx @@ -1449,7 +1450,7 @@ Optional Features: --enable-shared create shared libraries (ok, but not recommended) --enable-dynlib same as --enable-shared --enable-lt= use instead of libtool; disable to use bundled - --enable-libs install Racket static libraries, if any + --enable-libs install static libraries, if any (enabled by default) --enable-libffi use installed libffi (enabled by default for Unix) --enable-sdk= use Mac OS X 10.4 SDK directory --enable-sdk5= use Mac OS X 10.5 SDK directory @@ -1462,7 +1463,7 @@ Optional Features: --enable-macprefix allow --prefix with a Mac OS X install --enable-mac64 allow 64-bit Mac OS X build (enabled by default) --enable-cgcdefault use CGC as default build (NOT RECOMMENDED) - --enable-sgc use Senora GC instead of the Boehm GC (enabled by default) + --enable-sgc use Senora GC instead of Boehm GC (enabled by default) --enable-sgcdebug use Senora GC for debugging (expensive debug mode) --enable-backtrace 3m: support GC backtrace dumps (expensive debug mode) --enable-pthread link with pthreads (usually auto-enabled if needed) @@ -2680,9 +2681,11 @@ else enable_lt=default fi -# Check whether --enable-dynlib was given. -if test "${enable_dynlib+set}" = set; then : - enableval=$enable_dynlib; +# Check whether --enable-libs was given. +if test "${enable_libs+set}" = set; then : + enableval=$enable_libs; +else + enable_libs=yes fi @@ -3050,7 +3053,7 @@ show_explicitly_enabled "${enable_noopt}" "No-optimization" "Note that this mode show_explicitly_enabled "${enable_strip}" "Debug-symbol stripping" show_explicitly_disabled "${enable_strip}" "Debug-symbol stripping" -show_explicitly_enabled "${enable_libs}" "Installation of static libraries (if any)" +show_explicitly_disabled "${enable_libs}" "Installation of static libraries (if any)" show_explicitly_disabled "${enable_mac64}" "64-bit Mac OS X" diff --git a/racket/src/racket/Makefile.in b/racket/src/racket/Makefile.in index 91bb9d6645..3055055387 100644 --- a/racket/src/racket/Makefile.in +++ b/racket/src/racket/Makefile.in @@ -406,6 +406,8 @@ unix-install-cgc: unix-install-libs-cgc: cd ..; $(ICP) racket/libmzgc.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@" cd ..; $(ICP) racket/libracket.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket.@LIBSFX@" + cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@" + cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libdir)/libracket.@LIBSFX@" unix-no-install-libs-cgc: $(NOOP) @@ -422,6 +424,7 @@ unix-install-3m: unix-install-libs-3m: cd ..; $(ICP) racket/libracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@" + cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@" unix-no-install-libs-3m: $(NOOP) diff --git a/racket/src/racket/configure.ac b/racket/src/racket/configure.ac index 1675db1ff7..a6f7b73b3d 100644 --- a/racket/src/racket/configure.ac +++ b/racket/src/racket/configure.ac @@ -53,7 +53,7 @@ AC_ARG_ENABLE(natipkg, [ --enable-natipkg add "-natipkg" to library subp AC_ARG_ENABLE(shared, [ --enable-shared create shared libraries (ok, but not recommended)]) AC_ARG_ENABLE(dynlib, [ --enable-dynlib same as --enable-shared]) AC_ARG_ENABLE(lt, [ --enable-lt= use instead of libtool; disable to use bundled], LIBTOOLPROG="$enableval", enable_lt=default) -AC_ARG_ENABLE(dynlib, [ --enable-libs install Racket static libraries, if any]) +AC_ARG_ENABLE(libs, [ --enable-libs install static libraries, if any (enabled by default)], , enable_libs=yes) AC_ARG_ENABLE(libffi, [ --enable-libffi use installed libffi (enabled by default for Unix)], , enable_libffi=default) @@ -69,7 +69,7 @@ AC_ARG_ENABLE(macprefix, [ --enable-macprefix allow --prefix with a Mac OS AC_ARG_ENABLE(mac64, [ --enable-mac64 allow 64-bit Mac OS X build (enabled by default)], , enable_mac64=yes) AC_ARG_ENABLE(cgcdefault, [ --enable-cgcdefault use CGC as default build (NOT RECOMMENDED)]) -AC_ARG_ENABLE(sgc, [ --enable-sgc use Senora GC instead of the Boehm GC (enabled by default)], , enable_sgc=yes) +AC_ARG_ENABLE(sgc, [ --enable-sgc use Senora GC instead of Boehm GC (enabled by default)], , enable_sgc=yes) AC_ARG_ENABLE(sgcdebug,[ --enable-sgcdebug use Senora GC for debugging (expensive debug mode)]) AC_ARG_ENABLE(backtrace, [ --enable-backtrace 3m: support GC backtrace dumps (expensive debug mode)]) @@ -325,7 +325,7 @@ show_explicitly_enabled "${enable_noopt}" "No-optimization" "Note that this mode show_explicitly_enabled "${enable_strip}" "Debug-symbol stripping" show_explicitly_disabled "${enable_strip}" "Debug-symbol stripping" -show_explicitly_enabled "${enable_libs}" "Installation of static libraries (if any)" +show_explicitly_disabled "${enable_libs}" "Installation of static libraries (if any)" show_explicitly_disabled "${enable_mac64}" "64-bit Mac OS X"