diff options
Diffstat (limited to 'main/configure.in')
| -rw-r--r-- | main/configure.in | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/main/configure.in b/main/configure.in index 9072e378d2..a0e8667138 100644 --- a/main/configure.in +++ b/main/configure.in @@ -33,7 +33,7 @@ if test "x$PKG_CONFIG" = "xno"; then AC_MSG_ERROR([You need to install pkg-config]) fi -MONO_REQUIRED_VERSION=3.0.4 +MONO_REQUIRED_VERSION=4.0 if ! $PKG_CONFIG --atleast-version=$MONO_REQUIRED_VERSION mono; then AC_MSG_ERROR([You need mono $MONO_REQUIRED_VERSION or newer]) @@ -54,6 +54,7 @@ fi default_gnomeplatform=no default_windowsplatform=no default_macplatform=no +default_macarch=i386 case `uname` in Darwin) default_macplatform=yes ;; @@ -185,8 +186,8 @@ AM_CONDITIONAL(ENABLE_GIT, test x$enable_git = xyes) AC_ARG_ENABLE(release, AC_HELP_STRING([--enable-release], - [build release mode [default=no]]), - enable_release=${enableval}, enable_release=no) + [build release mode [default=yes]]), + enable_release=${enableval}, enable_release=yes) AM_CONDITIONAL(RELEASE_BUILDS, [test x$enable_release = xyes]) @@ -220,11 +221,29 @@ AC_ARG_ENABLE(macplatform, enable_macplatform=${enableval}, enable_macplatform=$default_macplatform) if test x$enable_macplatform = xyes; then - platform_bindings="${platform_bindings}Mac " + platform_bindings="${platform_bindings}Mac ${with_macarch}" fi AM_CONDITIONAL(ENABLE_MACPLATFORM, [test x$enable_macplatform = xyes]) +# What architecture for Mac +AC_ARG_WITH(macarch, + AC_HELP_STRING([--with-macarch], + [which architecture for mac: i386, x86_64 [default=i386]]), + with_macarch=${withval}, with_macarch=$default_macarch) + +SGEN_SUFFIX= +MONOSTUB_ARCH=32 +if test x$with_macarch = xx86_64; then + SGEN_SUFFIX=64 + MONOSTUB_ARCH=64 +fi +AC_SUBST(SGEN_SUFFIX) +AC_SUBST(MONOSTUB_ARCH) + +MAC_ARCHITECTURE=${with_macarch} +AC_SUBST(MAC_ARCHITECTURE) + # Windows platform addin AC_ARG_ENABLE(windowsplatform, AC_HELP_STRING([--enable-windowsplatform], |