X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=331e3b991d646a9814028d5c97a83a8cd875fee5;hb=cadba81047f6188fad2fe07004c3cb36316c36d1;hp=c6ce56c468cf222d871995db1901e1209508fcd5;hpb=17c5559e4b3f96ff2461e5fae0ac4d2f1e11bc15;p=ghc-hetmet.git diff --git a/configure.ac b/configure.ac index c6ce56c..331e3b99 100644 --- a/configure.ac +++ b/configure.ac @@ -242,6 +242,10 @@ case $host in ;; i386-apple-darwin|powerpc-apple-darwin) soext='.dylib' + CFLAGS="$CFLAGS -m32" + LDFLAGS="$LDFLAGS -m32" + SRC_CC_OPTS="$SRC_CC_OPTS -m32" + SRC_LD_OPTS="$SRC_LD_OPTS -m32" ;; x86_64-apple-darwin) soext='.dylib' @@ -396,36 +400,6 @@ AC_ARG_WITH(ld, [FP_PROG_LD()] ) -dnl ** Build shared and/or static libs? -dnl -------------------------------------------------------------- -AC_ARG_ENABLE(shared, -[AC_HELP_STRING([--enable-shared], -[Build shared libraries, if available (EXPERIMENTAL, non-working). [default=no]])], -[ if test x"$enableval" = x"yes"; then - AC_MSG_WARN([--enable-shared is experimental and not fully supported at this time]) - BuildSharedLibs=YES - else - BuildSharedLibs=NO - fi -], -[BuildSharedLibs=NO] -) -AC_SUBST(BuildSharedLibs) - -# ToDo later: -# AC_ARG_ENABLE(static, -# [AC_HELP_STRING([--enable-static], -# [Build static libraries. [default=yes]])], -# [ if test x"$enableval" = x"yes"; then -# BuildStaticLibs=YES -# else -# BuildStaticLibs=NO -# fi -# ], -# [BuildStaticLibs=YES] -# ) -# AC_SUBST(BuildStaticLibs) - dnl ** Booting from .hc files? dnl -------------------------------------------------------------- AC_ARG_ENABLE(hc-boot, @@ -896,7 +870,7 @@ if grep ' ' compiler/ghc.cabal.in 2>&1 >/dev/null; then AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them]) fi -AC_CONFIG_FILES([mk/config.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml distrib/ghc.iss]) +AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml distrib/ghc.iss]) AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h]) AC_OUTPUT @@ -966,9 +940,7 @@ fi echo ["\ Building DocBook HTML documentation : $BUILD_DOCBOOK_HTML Building DocBook PS documentation : $BUILD_DOCBOOK_PS - Building DocBook PDF documentation : $BUILD_DOCBOOK_PDF - - Building shared libraries : $BuildSharedLibs"] + Building DocBook PDF documentation : $BUILD_DOCBOOK_PDF"] echo ["---------------------------------------------------------------------- "]