diff --git a/racket/src/cfg-racket b/racket/src/cfg-racket index 8a099d2031..3739cc33ab 100755 --- a/racket/src/cfg-racket +++ b/racket/src/cfg-racket @@ -656,6 +656,7 @@ USE_WXPRECOMP WXPRECOMP MAKE_FINISH MRLIBINSTALL +ICP_STATIC_LIB ICP_LIB ICP WXVARIANT @@ -7011,6 +7012,7 @@ if test "${enable_shared}" = "yes" ; then WXLIBS=WXLIBSDYN ICP="${LIBTOOLPROG} --mode=install cp" ICP_LIB="${LIBTOOLPROG} --mode=install install -s" + ICP_STATIC_LIB='$(NOOP)' MRLIBINSTALL="install-lib" LIBFINISH="${LIBTOOLPROG} --mode=finish" LTO="lo" @@ -7024,6 +7026,7 @@ else WXLIBS=WXLIBSNORM ICP=cp ICP_LIB=cp + ICP_STATIC_LIB=cp MRLIBINSTALL="install-no-lib" LIBFINISH=echo LTO="o" @@ -7144,6 +7147,7 @@ LIBS="$LIBS $EXTRALIBS" + mk_needed_dir() diff --git a/racket/src/racket/Makefile.in b/racket/src/racket/Makefile.in index ca1401b513..ec7235f9fd 100644 --- a/racket/src/racket/Makefile.in +++ b/racket/src/racket/Makefile.in @@ -375,6 +375,7 @@ clean@OSX@: BUILDINFO=$(DESTDIR)$(libpltdir)/buildinfo ICP=@ICP@ ICP_LIB=@ICP_LIB@ +ICP_STATIC_LIB=@ICP_STATIC_LIB@ install: $(MAKE) install-@MAIN_VARIANT@ @@ -428,7 +429,7 @@ unix-install-cgc: unix-install-libs-cgc: cd ..; $(ICP_LIB) racket/libmzgc.@LIBSFX@ "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@" cd ..; $(ICP_LIB) racket/libracket.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket.@LIBSFX@" - cd ..; $(ICP_LIB) rktio/librktio.@LIBSFX@ "$(DESTDIR)$(libdir)/librktio.@LIBSFX@" + cd ..; $(ICP_STATIC_LIB) rktio/librktio.@LIBSFX@ "$(DESTDIR)$(libdir)/librktio.@LIBSFX@" cd ..; $(STRIP_LIB_DEBUG) "$(DESTDIR)$(libdir)/libmzgc.@LIBSFX@" cd ..; $(STRIP_LIB_DEBUG) "$(DESTDIR)$(libdir)/libracket.@LIBSFX@" @@ -447,7 +448,7 @@ unix-install-3m: unix-install-libs-3m: cd ..; $(ICP_LIB) racket/libracket3m.@LIBSFX@ "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@" - cd ..; $(ICP_LIB) rktio/librktio.@LIBSFX@ "$(DESTDIR)$(libdir)/librktio.@LIBSFX@" + cd ..; $(ICP_STATIC_LIB) rktio/librktio.@LIBSFX@ "$(DESTDIR)$(libdir)/librktio.@LIBSFX@" cd ..; $(STRIP_LIB_DEBUG) "$(DESTDIR)$(libdir)/libracket3m.@LIBSFX@" unix-no-install-libs-3m: diff --git a/racket/src/racket/configure.ac b/racket/src/racket/configure.ac index 92df52d877..cfe6576e4f 100644 --- a/racket/src/racket/configure.ac +++ b/racket/src/racket/configure.ac @@ -1409,6 +1409,7 @@ if test "${enable_shared}" = "yes" ; then WXLIBS=WXLIBSDYN ICP="${LIBTOOLPROG} --mode=install cp" ICP_LIB="${LIBTOOLPROG} --mode=install install -s" + ICP_STATIC_LIB='$(NOOP)' MRLIBINSTALL="install-lib" LIBFINISH="${LIBTOOLPROG} --mode=finish" LTO="lo" @@ -1422,6 +1423,7 @@ else WXLIBS=WXLIBSNORM ICP=cp ICP_LIB=cp + ICP_STATIC_LIB=cp MRLIBINSTALL="install-no-lib" LIBFINISH=echo LTO="o" @@ -1499,6 +1501,7 @@ AC_SUBST(WXLIBS) AC_SUBST(WXVARIANT) AC_SUBST(ICP) AC_SUBST(ICP_LIB) +AC_SUBST(ICP_STATIC_LIB) AC_SUBST(MRLIBINSTALL) AC_SUBST(MAKE_FINISH)