From 6bc50332ea27e7fa9b3fec79fd530fee064de19f Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 12 Sep 2007 23:50:18 +0000 Subject: [PATCH] fix --enable-{lib,user}fw configure option svn: r7324 --- src/configure | 9 +++++++-- src/mred/Makefile.in | 5 +++-- src/mzscheme/Makefile.in | 5 +++-- src/mzscheme/configure.ac | 6 +++++- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/configure b/src/configure index 2dd2a6e155..fe367b6e3d 100755 --- a/src/configure +++ b/src/configure @@ -314,7 +314,7 @@ ac_subdirs_all="$ac_subdirs_all foreign/gcc/libffi" ac_subdirs_all="$ac_subdirs_all llvm/llvm" ac_subdirs_all="$ac_subdirs_all wxcommon/jpeg" ac_subdirs_all="$ac_subdirs_all wxxt/src/x/wbuild" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CXX CXXFLAGS ac_ct_CXX CXXCPP RANLIB ac_ct_RANLIB PERL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS EGREP PREFLAGS COMPFLAGS PROFFLAGS SED AS AR STATIC_AR ARFLAGS WBUILD CC_FOR_BUILD REZ MZLINKER PLAIN_CC DYN_CFLAGS x_includes x_libraries OPTIONS MZOPTIONS CGCOPTIONS GC2OPTIONS MROPTIONS GCDIR MZBINTARGET MZINSTALLTARGET EXTRA_GMP_OBJ OSX NOT_OSX FRAMEWORK_INSTALL_DIR FRAMEWORK_REL_INSTALL INSTALL_ORIG_TREE EXE_SUFFIX MREDLINKER LIBSFX WXLIBS WXVARIANT ICP MRLIBINSTALL LIBFINISH MAKE_MRED MAKE_WBUILD MAKE_COPYTREE MAKE_FINISH WXPRECOMP USE_WXPRECOMP INCLUDEDEP WX_MMD_FLAG JPEG_A JPEG_INC ZLIB_A ZLIB_INC PNG_A OSKHOME EXTRA_OSK_LIBS FOREIGN_OBJSLIB_IF_USED FOREIGN_LIB_IF_USED FOREIGN_OBJSLIB FOREIGN_CONVENIENCE FOREIGNTARGET LIBMZSCHEME_DEP LIBMRED_DEP LLVMTARGET LTO LTA collectsdir libpltdir includepltdir docdir COLLECTS_PATH MMM MMM_INSTALLED MMM_CAP_INSTALLED CGC CGC_INSTALLED CGC_CAP_INSTALLED MAIN_VARIANT subdirs LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CXX CXXFLAGS ac_ct_CXX CXXCPP RANLIB ac_ct_RANLIB PERL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS EGREP PREFLAGS COMPFLAGS PROFFLAGS SED AS AR STATIC_AR ARFLAGS WBUILD CC_FOR_BUILD REZ MZLINKER PLAIN_CC DYN_CFLAGS x_includes x_libraries OPTIONS MZOPTIONS CGCOPTIONS GC2OPTIONS MROPTIONS GCDIR MZBINTARGET MZINSTALLTARGET EXTRA_GMP_OBJ OSX NOT_OSX FRAMEWORK_INSTALL_DIR FRAMEWORK_REL_INSTALL FRAMEWORK_PREFIX INSTALL_ORIG_TREE EXE_SUFFIX MREDLINKER LIBSFX WXLIBS WXVARIANT ICP MRLIBINSTALL LIBFINISH MAKE_MRED MAKE_WBUILD MAKE_COPYTREE MAKE_FINISH WXPRECOMP USE_WXPRECOMP INCLUDEDEP WX_MMD_FLAG JPEG_A JPEG_INC ZLIB_A ZLIB_INC PNG_A OSKHOME EXTRA_OSK_LIBS FOREIGN_OBJSLIB_IF_USED FOREIGN_LIB_IF_USED FOREIGN_OBJSLIB FOREIGN_CONVENIENCE FOREIGNTARGET LIBMZSCHEME_DEP LIBMRED_DEP LLVMTARGET LTO LTA collectsdir libpltdir includepltdir docdir COLLECTS_PATH MMM MMM_INSTALLED MMM_CAP_INSTALLED CGC CGC_INSTALLED CGC_CAP_INSTALLED MAIN_VARIANT subdirs LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1752,7 +1752,7 @@ show_explicitly_enabled "${enable_gcov}" "gcov" show_explicitly_enabled "${enable_noopt}" "No-optimization" show_explicitly_enabled "${enable_libfw}" "Frameworks-to-system" -show_explicitly_enabled "${enable_libfw}" "Frameworks-to-user" +show_explicitly_enabled "${enable_userfw}" "Frameworks-to-user" ###### Some defaults ####### @@ -5494,12 +5494,15 @@ case $OS in if test "${enable_libfw}" = "yes" ; then FRAMEWORK_INSTALL_DIR=/Library/Frameworks FRAMEWORK_REL_INSTALL=no + FRAMEWORK_PREFIX='' elif test "${enable_userfw}" = "yes" ; then FRAMEWORK_INSTALL_DIR=~/Library/Frameworks FRAMEWORK_REL_INSTALL=no + FRAMEWORK_PREFIX='' else FRAMEWORK_INSTALL_DIR='${libdir}' FRAMEWORK_REL_INSTALL=yes + FRAMEWORK_PREFIX='$(FRAMEWORK_REL_PREFIX)' fi else PREFLAGS="$PREFLAGS -DXONX " @@ -11318,6 +11321,7 @@ LIBS="$LIBS $EXTRALIBS" + mk_needed_dir() @@ -12154,6 +12158,7 @@ s,@OSX@,$OSX,;t t s,@NOT_OSX@,$NOT_OSX,;t t s,@FRAMEWORK_INSTALL_DIR@,$FRAMEWORK_INSTALL_DIR,;t t s,@FRAMEWORK_REL_INSTALL@,$FRAMEWORK_REL_INSTALL,;t t +s,@FRAMEWORK_PREFIX@,$FRAMEWORK_PREFIX,;t t s,@INSTALL_ORIG_TREE@,$INSTALL_ORIG_TREE,;t t s,@EXE_SUFFIX@,$EXE_SUFFIX,;t t s,@MREDLINKER@,$MREDLINKER,;t t diff --git a/src/mred/Makefile.in b/src/mred/Makefile.in index 761b1045e2..2abbae21a5 100644 --- a/src/mred/Makefile.in +++ b/src/mred/Makefile.in @@ -331,6 +331,7 @@ install-wx_xt-post-collects: # Mac OS X ---------------------------------------- MRFWDIR = @FRAMEWORK_INSTALL_DIR@/PLT_MrEd.framework +FRAMEWORK_REL_PREFIX="@executable_path/../../../lib/" install-wx_mac: rm -rf $(MRFWDIR)/Versions/$(FWVERSION) @@ -348,7 +349,7 @@ install-wx_mac-cgc: $(MZSCHEME) -qr "$(srcdir)/../mac/rename-app.ss" "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app" "MrEd@CGC@" "MrEd@CGC_CAP_INSTALLED@" $(ICP) PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd $(MRFWDIR)/Versions/$(FWVERSION)/PLT_MrEd $(ICP) -r PLT_MrEd.framework/Versions/$(FWVERSION)/Resources $(MRFWDIR)/Versions/$(FWVERSION)/Resources - if [ @FRAMEWORK_REL_INSTALL@ = yes ] ; then /usr/bin/install_name_tool -change "@executable_path/../../../PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" "@executable_path/../../../lib/PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app/Contents/MacOS/MrEd@CGC_CAP_INSTALLED@" ; fi + /usr/bin/install_name_tool -change "@executable_path/../../../PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" "@FRAMEWORK_PREFIX@PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd" "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app/Contents/MacOS/MrEd@CGC_CAP_INSTALLED@" $(MZSCHEME) -mvqu "$(srcdir)/../mzscheme/collects-path.ss" "$(prefix)/MrEd@CGC_CAP_INSTALLED@.app/Contents/MacOS/MrEd@CGC_CAP_INSTALLED@" ../../../collects install-wx_mac-cgc-final: @@ -361,7 +362,7 @@ install-wx_mac-3m: $(MZSCHEME) -qr "$(srcdir)/../mac/rename-app.ss" "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app" "MrEd@MMM@" "MrEd@MMM_CAP_INSTALLED@" $(ICP) "PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd" "$(MRFWDIR)/Versions/$(FWVERSION)_3m/PLT_MrEd" $(ICP) -r "PLT_MrEd.framework/Versions/$(FWVERSION)_3m/Resources" "$(MRFWDIR)/Versions/$(FWVERSION)_3m/Resources" - if [ @FRAMEWORK_REL_INSTALL@ = yes ] ; then /usr/bin/install_name_tool -change "@executable_path/../../../PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd" "@executable_path/../../../lib/PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd" "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app/Contents/MacOS/MrEd@MMM_CAP_INSTALLED@" ; fi + /usr/bin/install_name_tool -change "@executable_path/../../../PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd" "@FRAMEWORK_PREFIX@PLT_MrEd.framework/Versions/$(FWVERSION)_3m/PLT_MrEd" "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app/Contents/MacOS/MrEd@MMM_CAP_INSTALLED@" $(MZSCHEME) -mvqu "$(srcdir)/../mzscheme/collects-path.ss" "$(prefix)/MrEd@MMM_CAP_INSTALLED@.app/Contents/MacOS/MrEd@MMM_CAP_INSTALLED@" "../../../collects" install-wx_mac-3m-final: diff --git a/src/mzscheme/Makefile.in b/src/mzscheme/Makefile.in index f6fc6b1c9e..baea232328 100644 --- a/src/mzscheme/Makefile.in +++ b/src/mzscheme/Makefile.in @@ -297,6 +297,7 @@ unix-install-3m-final: MZFWDIR = @FRAMEWORK_INSTALL_DIR@/PLT_MzScheme.framework MZFWMMM = PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme +FRAMEWORK_REL_PREFIX = "@executable_path/../lib/" osx-install: $(MAKE) unix-install @@ -310,7 +311,7 @@ osx-install-cgc: $(MAKE) unix-install-cgc mkdir -p "$(MZFWDIR)/Versions/$(FWVERSION)" cp $(MZFW) $(MZFWDIR)/Versions/$(FWVERSION)/ - if [ @FRAMEWORK_REL_INSTALL@ = yes ] ; then /usr/bin/install_name_tool -change "@executable_path/PLT_MzScheme.framework/Versions/$(FWVERSION)/PLT_MzScheme" "@executable_path/../lib/PLT_MzScheme.framework/Versions/$(FWVERSION)/PLT_MzScheme" "$(bindir)/mzscheme@CGC_INSTALLED@" ; fi + /usr/bin/install_name_tool -change "@executable_path/PLT_MzScheme.framework/Versions/$(FWVERSION)/PLT_MzScheme" "@FRAMEWORK_PREFIX@PLT_MzScheme.framework/Versions/$(FWVERSION)/PLT_MzScheme" "$(bindir)/mzscheme@CGC_INSTALLED@" osx-install-cgc-final: $(MAKE) unix-install-cgc-final @@ -320,7 +321,7 @@ osx-install-3m: $(MAKE) unix-install-3m mkdir -p "$(MZFWDIR)/Versions/$(FWVERSION)_3m" cp $(MZFWMMM) $(MZFWDIR)/Versions/$(FWVERSION)_3m/ - if [ @FRAMEWORK_REL_INSTALL@ = yes ] ; then /usr/bin/install_name_tool -change "@executable_path/PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "@executable_path/../lib/PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "$(bindir)/mzscheme@MMM_INSTALLED@" ; fi + /usr/bin/install_name_tool -change "@executable_path/PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "@FRAMEWORK_PREFIX@PLT_MzScheme.framework/Versions/$(FWVERSION)_3m/PLT_MzScheme" "$(bindir)/mzscheme@MMM_INSTALLED@" osx-install-3m-final: $(MAKE) unix-install-3m-final diff --git a/src/mzscheme/configure.ac b/src/mzscheme/configure.ac index 049cad3357..6bb4809ac5 100644 --- a/src/mzscheme/configure.ac +++ b/src/mzscheme/configure.ac @@ -282,7 +282,7 @@ show_explicitly_enabled "${enable_gcov}" "gcov" show_explicitly_enabled "${enable_noopt}" "No-optimization" show_explicitly_enabled "${enable_libfw}" "Frameworks-to-system" -show_explicitly_enabled "${enable_libfw}" "Frameworks-to-user" +show_explicitly_enabled "${enable_userfw}" "Frameworks-to-user" ###### Some defaults ####### @@ -623,12 +623,15 @@ case $OS in if test "${enable_libfw}" = "yes" ; then FRAMEWORK_INSTALL_DIR=/Library/Frameworks FRAMEWORK_REL_INSTALL=no + FRAMEWORK_PREFIX='' elif test "${enable_userfw}" = "yes" ; then FRAMEWORK_INSTALL_DIR=~/Library/Frameworks FRAMEWORK_REL_INSTALL=no + FRAMEWORK_PREFIX='' else FRAMEWORK_INSTALL_DIR='${libdir}' FRAMEWORK_REL_INSTALL=yes + FRAMEWORK_PREFIX='$(FRAMEWORK_REL_PREFIX)' fi else PREFLAGS="$PREFLAGS -DXONX " @@ -1275,6 +1278,7 @@ AC_SUBST(OSX) AC_SUBST(NOT_OSX) AC_SUBST(FRAMEWORK_INSTALL_DIR) AC_SUBST(FRAMEWORK_REL_INSTALL) +AC_SUBST(FRAMEWORK_PREFIX) AC_SUBST(INSTALL_ORIG_TREE) AC_SUBST(EXE_SUFFIX)