Changeset 10046 for trunk/configure.ac

Timestamp:

Jan 29, 2010, 7:11:56 PM (12 years ago)

Author:

charles

Message:

(trunk) #2795 "non-GUI compilation issues on OS X 10.4" -- fixed for 1.90

File:

• trunk/configure.ac (modified) (2 diffs)

trunk/configure.ac

@@ -386 +386 @@
   *darwin*)
     have_darwin="yes"
+    CFLAGS="-DMACOSX $CFLAGS"
+    ;;
+
+esac
+
+AC_ARG_ENABLE([cli],
+              [AS_HELP_STRING([--enable-cli],[build command-line client])],
+              [build_cli=${enableval}],
+              [build_cli="yes"])
+AM_CONDITIONAL([BUILD_CLI],[test "x$build_cli" = "xyes"])
+
+AC_ARG_ENABLE([mac],
+              [AS_HELP_STRING([--enable-mac],[build Mac client])],
+              [build_mac=${enableval}],
+              [build_mac=${have_darwin}])
+AM_CONDITIONAL([BUILD_MAC],[test "x$build_mac" = "xyes"])
+
+AC_ARG_ENABLE([daemon],
+              [AS_HELP_STRING([--enable-daemon],[build daemon])],
+              [build_daemon=${enableval}],
+              [build_daemon="yes"])
+AM_CONDITIONAL([BUILD_DAEMON],[test "x$build_daemon" = "xyes"])
+
+
+if test "x$build_mac" = "xyes" ; then
     # Make sure the proper Mac SDK is installed
     if test ! -d /Developer/SDKs/MacOSX10.5.sdk; then
       cat << EOF
-You need to install the Mac OS X 10.5 SDK in order to build Transmission:
+You need to install the Mac OS X 10.5 SDK in order to build Transmission
+with --enable-mac:
   Get your Xcode CD or package
   Restart the install
@@ -398 +424 @@
       exit 1
     fi
-    ;;
-
-esac
-
-AC_ARG_ENABLE([cli],
-              [AS_HELP_STRING([--enable-cli],[build command-line client])],
-              [build_cli=${enableval}],
-              [build_cli="yes"])
-AM_CONDITIONAL([BUILD_CLI],[test "x$build_cli" = "xyes"])
-
-AC_ARG_ENABLE([mac],
-              [AS_HELP_STRING([--enable-mac],[build Mac client])],
-              [build_mac=${enableval}],
-              [build_mac=${have_darwin}])
-AM_CONDITIONAL([BUILD_MAC],[test "x$build_mac" = "xyes"])
-
-AC_ARG_ENABLE([daemon],
-              [AS_HELP_STRING([--enable-daemon],[build daemon])],
-              [build_daemon=${enableval}],
-              [build_daemon="yes"])
-AM_CONDITIONAL([BUILD_DAEMON],[test "x$build_daemon" = "xyes"])
-
-
+fi
 if test "x$have_darwin" = "xyes"; then
     AC_DEFINE([HAVE_DARWIN], 1)