diff -rN -u old-haskell-platform/src/generic/tarball/configure.ac new-haskell-platform/src/generic/tarball/configure.ac
|
old
|
new
|
|
| 104 | 104 | [ENABLE_PROFILING=YES] |
| 105 | 105 | ) |
| 106 | 106 | |
| | 107 | # Not building shared libraries by default. |
| | 108 | AC_ARG_ENABLE(shared, |
| | 109 | [AC_HELP_STRING([--enable-shared], |
| | 110 | [Build shared versions of libraries for dynamic linking. (default=disable)])], |
| | 111 | [case "${enableval}" in |
| | 112 | yes) |
| | 113 | ENABLE_SHARED=YES |
| | 114 | ;; |
| | 115 | no) |
| | 116 | ENABLE_SHARED=NO |
| | 117 | ;; |
| | 118 | *) |
| | 119 | AC_MSG_ERROR([The --enable-shared value should be "yes" or "no"]) |
| | 120 | ;; |
| | 121 | esac |
| | 122 | ], |
| | 123 | [ENABLE_SHARED=NO] |
| | 124 | ) |
| | 125 | |
| 107 | 126 | |
| 108 | 127 | AC_ARG_ENABLE(unsupported-ghc-version, |
| 109 | 128 | [AC_HELP_STRING([--enable-unsupported-ghc-version], |
| … |
… |
|
| 250 | 269 | |
| 251 | 270 | AC_SUBST([USER_INSTALL]) |
| 252 | 271 | AC_SUBST([ENABLE_PROFILING]) |
| | 272 | AC_SUBST([ENABLE_SHARED]) |
| 253 | 273 | AC_SUBST([ALLOW_UNSUPPORTED_GHC]) |
| 254 | 274 | |
| 255 | 275 | AC_OUTPUT |
diff -rN -u old-haskell-platform/src/generic/tarball/scripts/build.sh new-haskell-platform/src/generic/tarball/scripts/build.sh
|
old
|
new
|
|
| 74 | 74 | if test "${ENABLE_PROFILING}" = "YES"; then |
| 75 | 75 | CABAL_PROFILING_FLAG="--enable-library-profiling" |
| 76 | 76 | fi |
| | 77 | if test "${ENABLE_SHARED}" = "YES"; then |
| | 78 | CABAL_SHARED_FLAG="--enable-shared" |
| | 79 | |
| | 80 | # Work around for Cabal's inability to pass this option |
| | 81 | GHC_PKG_FLAG_SHARED="--ghc-option=-package-conf=../../${PACKAGE_DB}" |
| | 82 | fi |
| 77 | 83 | |
| 78 | 84 | # Work around for Cabal 1.8.0.2 not registering properly |
| 79 | 85 | GHC_PKG_FLAG=--ghc-pkg-option=--package-conf="../../${PACKAGE_DB}" |
| … |
… |
|
| 88 | 94 | tell ./Setup configure --package-db="../../${PACKAGE_DB}" --prefix="${prefix}" \ |
| 89 | 95 | --with-compiler=${GHC} --with-hc-pkg=${GHC_PKG} --with-hsc2hs=${HSC2HS} \ |
| 90 | 96 | ${HAPPY_FLAG1} ${HAPPY_FLAG2} ${ALEX_FLAG} \ |
| 91 | | ${CABAL_INSTALL_FLAG} ${CABAL_PROFILING_FLAG} \ |
| 92 | | ${EXTRA_CONFIGURE_OPTS} ${VERBOSE} ${GHC_PKG_FLAG} ${USER_PKG_FLAG} \ |
| | 97 | ${CABAL_INSTALL_FLAG} ${CABAL_PROFILING_FLAG} ${CABAL_SHARED_FLAG} \ |
| | 98 | ${EXTRA_CONFIGURE_OPTS} ${VERBOSE} \ |
| | 99 | ${GHC_PKG_FLAG} ${GHC_PKG_FLAG_SHARED} ${USER_PKG_FLAG} \ |
| 93 | 100 | || die "Configuring the ${PKG} package failed" |
| 94 | 101 | |
| 95 | 102 | tell ./Setup build ${VERBOSE} \ |
diff -rN -u old-haskell-platform/src/generic/tarball/scripts/config.in new-haskell-platform/src/generic/tarball/scripts/config.in
|
old
|
new
|
|
| 17 | 17 | ALLOW_UNSUPPORTED_GHC=@ALLOW_UNSUPPORTED_GHC@ |
| 18 | 18 | USER_INSTALL=@USER_INSTALL@ |
| 19 | 19 | ENABLE_PROFILING=@ENABLE_PROFILING@ |
| | 20 | ENABLE_SHARED=@ENABLE_SHARED@ |