From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sat, 3 Oct 2009 13:04:27 +0000 (+0100)
Subject: Default to 32-bit builds on OS X.  Apple's compiler now defaults to 64
X-Git-Tag: 5.0~94
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/1746361eb1ff52276e542ace235f47a43769e97b

Default to 32-bit builds on OS X.  Apple's compiler now defaults to 64
bits but existing Fink installs will be 32 bits.  DisOrder's default
is liable to change when I change my Fink l-)

Use --with-bits=32 or --with-bits=64 to override the default.
---

diff --git a/README b/README
index 482bc39..010a9db 100644
--- a/README
+++ b/README
@@ -88,6 +88,9 @@ platform, please get in touch.
      --without-gtk          Don't build GTK+ client (Disobedience)
      --without-python       Don't build Python support
 
+   On a Mac you can use --with-bits=64 to request a 64-bit build.  The default
+   is 32 bits.  You will need suitable versions of all the libraries used.
+
    If configure cannot guess where your web server keeps its HTML documents and
    CGI programs, you may have to tell it, for instance:
 
diff --git a/configure.ac b/configure.ac
index 95cb413..8b2e278 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,8 +91,12 @@ AC_ARG_WITH([tests],
 	    [want_tests=$withval])
 AC_ARG_WITH([gtk-osx],
 	    [AS_HELP_STRING([--with-gtk-osx],
-			    [use native GTK+])],
+			    [use native GTK+ (OS X only)])],
 	    [want_gtkosx=$withval])
+AC_ARG_WITH([bits],
+            [AS_HELP_STRING([--with-bits=64],
+                            [request a 64-bit build (OS X only)])],
+            [BITS=$withval])
 
 AC_MSG_CHECKING([for a known target platform])
 case "$host" in
@@ -110,6 +114,12 @@ case "$host" in
   ;;
 *-apple-darwin* )
   AC_MSG_RESULT([Mac OS X])
+  AC_MSG_CHECKING([bitness])
+  if test "x$BITS" = "x"; then
+    BITS=32
+  fi
+  AC_MSG_RESULT([$BITS])
+  CC="$CC -m$BITS"
   if test $want_coreaudio = yes; then
     COREAUDIO="-framework CoreFoundation -framework CoreServices -framework CoreAudio"
   fi