diff --git a/racket/src/configure b/racket/src/configure index 36e0c66d07..fd7fc13e17 100755 --- a/racket/src/configure +++ b/racket/src/configure @@ -761,6 +761,7 @@ CGC_INSTALLED CGC_CAP_INSTALLED MAIN_VARIANT INSTALL_SETUP_FLAGS +INSTALL_LIBS_ENABLE RUN_RACKET_CGC RUN_RACKET_MMM RUN_RACKET_MAIN_VARIANT @@ -1356,6 +1357,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-libffi use installed libffi (enabled by default for Unix) --enable-sdk= use Mac OS X 10.4 SDK directory --enable-sdk6= use Mac OS X 10.6 SDK directory @@ -2067,6 +2069,11 @@ else enable_lt=default fi +# Check whether --enable-dynlib was given. +if test "${enable_dynlib+set}" = set; then + enableval=$enable_dynlib; +fi + # Check whether --enable-libffi was given. if test "${enable_libffi+set}" = set; then @@ -2399,6 +2406,8 @@ 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_mac64}" "64-bit Mac OS X" show_explicitly_enabled "${enable_libfw}" "Frameworks-to-system" @@ -2488,6 +2497,8 @@ MAIN_VARIANT=3m INSTALL_SETUP_FLAGS= +INSTALL_LIBS_ENABLE=no-install + STRIP_DEBUG=":" enable_strip_by_default=yes @@ -4015,6 +4026,7 @@ fi if test "${enable_shared}" = "yes" ; then LIBRACKET_DEP="${LIBRACKET_DEP} libmzgc.la" + INSTALL_LIBS_ENABLE=install fi if test "${enable_foreign}" = "yes" ; then @@ -4024,6 +4036,10 @@ if test "${enable_jit}" = "yes" ; then check_for_mprotect=yes fi +if test "${enable_libs}" = "yes" ; then + INSTALL_LIBS_ENABLE=install +fi + ############## platform tests ################ # for flags we don't want to use in config tests: @@ -9220,6 +9236,8 @@ LIBS="$LIBS $EXTRALIBS" + + @@ -10099,6 +10117,7 @@ CGC_INSTALLED!$CGC_INSTALLED$ac_delim CGC_CAP_INSTALLED!$CGC_CAP_INSTALLED$ac_delim MAIN_VARIANT!$MAIN_VARIANT$ac_delim INSTALL_SETUP_FLAGS!$INSTALL_SETUP_FLAGS$ac_delim +INSTALL_LIBS_ENABLE!$INSTALL_LIBS_ENABLE$ac_delim RUN_RACKET_CGC!$RUN_RACKET_CGC$ac_delim RUN_RACKET_MMM!$RUN_RACKET_MMM$ac_delim RUN_RACKET_MAIN_VARIANT!$RUN_RACKET_MAIN_VARIANT$ac_delim @@ -10108,7 +10127,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/racket/src/racket/Makefile.in b/racket/src/racket/Makefile.in index 7e23ef2293..9a1ca1458c 100644 --- a/racket/src/racket/Makefile.in +++ b/racket/src/racket/Makefile.in @@ -342,23 +342,35 @@ unix-install: cd ..; echo 'LIBS=@LIBS@' >> "$(BUILDINFO)" unix-install-cgc: - cd ..; $(ICP) racket/libmzgc.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@" - cd ..; $(ICP) racket/libracket.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket.@LIBSFX@" + $(MAKE) unix-@INSTALL_LIBS_ENABLE@-libs-cgc cd ..; $(ICP) racket/racket@CGC@ "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@" cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@" cd ..; cp racket/mzdyn.o "$(DESTDIR)$(libpltdir)/mzdyn.o" @RUN_RACKET_CGC@ -cu "$(srcdir)/collects-path.rkt" "$(DESTDIR)$(bindir)/racket@CGC_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ @CONFIG_PATH@ +unix-install-libs-cgc: + cd ..; $(ICP) racket/libmzgc.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@" + cd ..; $(ICP) racket/libracket.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket.@LIBSFX@" + +unix-no-install-libs-cgc: + $(NOOP) + unix-install-cgc-final: $(NOOP) unix-install-3m: cd ..; $(ICP) racket/racket@MMM@ "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@" cd ..; $(STRIP_DEBUG) "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@" - cd ..; $(ICP) racket/libracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@" + $(MAKE) unix-@INSTALL_LIBS_ENABLE@-libs-3m cd ..; $(ICP) racket/mzdyn3m.o "$(DESTDIR)$(libpltdir)/mzdyn3m.o" @RUN_RACKET_MMM@ -cu "$(srcdir)/collects-path.rkt" "$(DESTDIR)$(bindir)/racket@MMM_INSTALLED@@EXE_SUFFIX@" @COLLECTS_PATH@ @CONFIG_PATH@ +unix-install-libs-3m: + cd ..; $(ICP) racket/libracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@" + +unix-no-install-libs-3m: + $(NOOP) + unix-install-3m-final: $(NOOP) diff --git a/racket/src/racket/configure.ac b/racket/src/racket/configure.ac index ff72473484..9ca90ada31 100644 --- a/racket/src/racket/configure.ac +++ b/racket/src/racket/configure.ac @@ -45,6 +45,7 @@ AC_ARG_ENABLE(usersetup, [ --enable-usersetup setup user-specific files on 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(libffi, [ --enable-libffi use installed libffi (enabled by default for Unix)], , enable_libffi=default) @@ -297,6 +298,8 @@ 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_mac64}" "64-bit Mac OS X" show_explicitly_enabled "${enable_libfw}" "Frameworks-to-system" @@ -386,6 +389,8 @@ MAIN_VARIANT=3m INSTALL_SETUP_FLAGS= +INSTALL_LIBS_ENABLE=no-install + STRIP_DEBUG=":" enable_strip_by_default=yes @@ -514,6 +519,7 @@ fi if test "${enable_shared}" = "yes" ; then LIBRACKET_DEP="${LIBRACKET_DEP} libmzgc.la" + INSTALL_LIBS_ENABLE=install fi if test "${enable_foreign}" = "yes" ; then @@ -523,6 +529,10 @@ if test "${enable_jit}" = "yes" ; then check_for_mprotect=yes fi +if test "${enable_libs}" = "yes" ; then + INSTALL_LIBS_ENABLE=install +fi + ############## platform tests ################ # for flags we don't want to use in config tests: @@ -1510,6 +1520,8 @@ AC_SUBST(MAIN_VARIANT) AC_SUBST(INSTALL_SETUP_FLAGS) +AC_SUBST(INSTALL_LIBS_ENABLE) + AC_SUBST(RUN_RACKET_CGC) AC_SUBST(RUN_RACKET_MMM) AC_SUBST(RUN_RACKET_MAIN_VARIANT)