diff --git a/src/configure b/src/configure index 679d8ba0b8..1fa9ac9ae4 100755 --- a/src/configure +++ b/src/configure @@ -742,7 +742,6 @@ FOREIGN_OBJSLIB FOREIGN_CONVENIENCE FOREIGNTARGET LIBRACKET_DEP -LIBGRACKET_DEP LTO LTA collectsdir @@ -3935,6 +3934,10 @@ if test "$CC_FOR_BUILD" = "" ; then CC_FOR_BUILD="$CC" fi +if test "${enable_shared}" = "yes" ; then + LIBRACKET_DEP="${LIBRACKET_DEP} libmzgc.la" +fi + ############## platform tests ################ # for flags we don't want to use in config tests: @@ -4068,8 +4071,7 @@ _ACEOF MZINSTALLTARGET=unix-cygwin-install if test "${enable_shared}" = "yes" ; then ar_libtool_no_undefined=" -no-undefined" - LIBRACKET_DEP="libmzgc.la -liconv" - LIBGRACKET_DEP="../racket/libmzgc.la ../racket/libgracket.la" + LIBRACKET_DEP="${LIBRACKET_DEP} -liconv" fi EXE_SUFFIX=".exe" ;; @@ -9031,7 +9033,6 @@ LIBS="$LIBS $EXTRALIBS" - mk_needed_dir() @@ -9891,7 +9892,6 @@ FOREIGN_OBJSLIB!$FOREIGN_OBJSLIB$ac_delim FOREIGN_CONVENIENCE!$FOREIGN_CONVENIENCE$ac_delim FOREIGNTARGET!$FOREIGNTARGET$ac_delim LIBRACKET_DEP!$LIBRACKET_DEP$ac_delim -LIBGRACKET_DEP!$LIBGRACKET_DEP$ac_delim LTO!$LTO$ac_delim LTA!$LTA$ac_delim collectsdir!$collectsdir$ac_delim @@ -9915,7 +9915,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` = 53; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/src/racket/configure.ac b/src/racket/configure.ac index c501c4cf57..f6568e5446 100644 --- a/src/racket/configure.ac +++ b/src/racket/configure.ac @@ -465,6 +465,10 @@ if test "$CC_FOR_BUILD" = "" ; then CC_FOR_BUILD="$CC" fi +if test "${enable_shared}" = "yes" ; then + LIBRACKET_DEP="${LIBRACKET_DEP} libmzgc.la" +fi + ############## platform tests ################ # for flags we don't want to use in config tests: @@ -594,8 +598,7 @@ case "$host_os" in MZINSTALLTARGET=unix-cygwin-install if test "${enable_shared}" = "yes" ; then ar_libtool_no_undefined=" -no-undefined" - LIBRACKET_DEP="libmzgc.la -liconv" - LIBGRACKET_DEP="../racket/libmzgc.la ../racket/libgracket.la" + LIBRACKET_DEP="${LIBRACKET_DEP} -liconv" fi EXE_SUFFIX=".exe" ;; @@ -1360,7 +1363,6 @@ AC_SUBST(FOREIGN_CONVENIENCE) AC_SUBST(FOREIGNTARGET) AC_SUBST(LIBRACKET_DEP) -AC_SUBST(LIBGRACKET_DEP) AC_SUBST(LTO) AC_SUBST(LTA)