Applied context menu patch.

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index de2761229a0b53268d04b1a70697a968eebd908e..fb2ed7ec749a8a6cbc9b871dbb6b560340b45fdf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4867,11 +4867,6 @@ if test "$wxUSE_GEOMETRY" = "yes"; then
   AC_DEFINE(wxUSE_GEOMETRY)
 fi
 
   AC_DEFINE(wxUSE_GEOMETRY)
 fi
 

-if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
-  AC_DEFINE(wxUSE_DIALUP_MANAGER)
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
-fi
-

 if test "$wxUSE_STREAMS" = "yes" ; then
   AC_DEFINE(wxUSE_STREAMS)
 fi
 if test "$wxUSE_STREAMS" = "yes" ; then
   AC_DEFINE(wxUSE_STREAMS)
 fi


@@ -5754,6 +5749,15 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
     fi
 fi
 
     fi
 fi
 

+if test "$wxUSE_DIALUP" = "yes"; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
+        AC_MSG_WARN([Dialup manager not yet supported under Mac OS X... disabled])
+    else
+        AC_DEFINE(wxUSE_DIALUP_MANAGER)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
+    fi
+fi
+

 if test "$wxUSE_TIPWINDOW" = "yes"; then
     if test "$wxUSE_PM" = 1; then
         AC_MSG_WARN([wxTipWindow not yet supported under PM... disabled])
 if test "$wxUSE_TIPWINDOW" = "yes"; then
     if test "$wxUSE_PM" = 1; then
         AC_MSG_WARN([wxTipWindow not yet supported under PM... disabled])


@@ -6058,6 +6062,9 @@ if test "$wxUSE_MAC" = 1 ; then
 fi
 if test "$wxUSE_COCOA" = 1 ; then
     LDFLAGS="$LDFLAGS -framework Cocoa"
 fi
 if test "$wxUSE_COCOA" = 1 ; then
     LDFLAGS="$LDFLAGS -framework Cocoa"

+    if test "$wxUSE_MEDIACTRL" = "yes"; then
+        LDFLAGS="$LDFLAGS -framework QuickTime"
+    fi

 fi
 
 dnl FIXME: should this be covered by the conditional above
 fi
 
 dnl FIXME: should this be covered by the conditional above