configure.ac: allow disabling winemac.drv (try 2)

Austin English austinenglish at gmail.com
Thu Aug 8 20:21:06 CDT 2013


try 2: don't unconditionally disable ApplicationServices.h

Tested on 10.7

-- 
-Austin
-------------- next part --------------
diff --git a/configure.ac b/configure.ac
index 0e3df61..5e1fe10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,7 @@ AC_ARG_WITH(pthread,   AS_HELP_STRING([--without-pthread],[do not use the pthrea
 AC_ARG_WITH(sane,      AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
 AC_ARG_WITH(tiff,      AS_HELP_STRING([--without-tiff],[do not use TIFF]))
 AC_ARG_WITH(v4l,       AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)]))
+AC_ARG_WITH(winemac,   AS_HELP_STRING([--without-winemac],[do not build native Mac (Cocoa) driver]))
 AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
 AC_ARG_WITH(xcursor,   AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]),
@@ -806,7 +807,7 @@ clean::
     fi
 
     dnl Enable Mac driver on Mac OS X 10.6 or later
-    if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes"
+    if test "x$with_winemac" != "xno" -a "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes"
     then
         ac_save_LIBS="$LIBS"
         LIBS="$LIBS $APPLICATIONSERVICESLIB"


More information about the wine-patches mailing list