From 21976d47df74f51f1694a93152737abf5ea4deaf Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Fri, 15 Aug 2008 21:01:02 +0000
Subject: [PATCH] #1196: configure switch --enable-darwin is dubious

---
 Makefile.am  |  6 +++---
 configure.ac | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 567ba1acc..330fe6f01 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,12 +9,12 @@ endif
 if BUILD_DAEMON
   DAEMON_DIR = daemon
 endif
-if BUILD_DARWIN
-  MAC_DIR = macosx
-endif
 if BUILD_GTK
   GTK_DIR = gtk po
 endif
+if BUILD_MAC
+  MAC_DIR = macosx
+endif
 if BUILD_WX
   WX_DIR = wx
 endif
diff --git a/configure.ac b/configure.ac
index b4966a672..e78cf3d80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -284,11 +284,11 @@ AC_ARG_ENABLE([cli],
               [build_cli="yes"])
 AM_CONDITIONAL([BUILD_CLI],[test "x$build_cli" = "xyes"])
 
-AC_ARG_ENABLE([darwin],
-              [AC_HELP_STRING([--enable-darwin],[build OS X client])],
-              [build_darwin=${enableval}],
-              [build_darwin=${have_darwin}])
-AM_CONDITIONAL([BUILD_DARWIN],[test "x$build_darwin" = "xyes"])
+AC_ARG_ENABLE([mac],
+              [AC_HELP_STRING([--enable-mac],[build OS X client])],
+              [build_mac=${enableval}],
+              [build_mac=${have_darwin}])
+AM_CONDITIONAL([BUILD_MAC],[test "x$build_mac" = "xyes"])
 
 AC_ARG_ENABLE([daemon],
               [AC_HELP_STRING([--enable-daemon],[build daemon])],
@@ -346,7 +346,7 @@ Configuration:
           ... gio support:          ${use_gio}
           ... dbus-glib support:    ${use_dbus_glib}
           ... libnotify support:    ${use_libnotify}
-        Build OS X client:          ${build_darwin}
+        Build OS X client:          ${build_mac}
         Build wxWidgets client:     ${build_wx}
 
 "