X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4cdb0ab00b53473e46fc014f5027d6ae1d9c812d..88fe14c06ffc86ce7911a526d3bb2561690511f0:/configure?ds=sidebyside

diff --git a/configure b/configure
index d30a426733..0ac60f549a 100755
--- a/configure
+++ b/configure
@@ -18732,11 +18732,6 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
         wxUSE_DRAG_AND_DROP=no
     fi
 
-    if test "$wxUSE_MAC" = 1; then
-        echo "configure: warning: Drag and drop not yet supported under Mac OS X... disabled" 1>&2
-        wxUSE_DRAG_AND_DROP=no
-    fi
-
     if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
         cat >> confdefs.h <<\EOF
 #define wxUSE_DRAG_AND_DROP 1
@@ -19195,34 +19190,47 @@ EOF
 
 fi
 
-if test "$wxUSE_URL" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_URL 1
-EOF
-
-fi
-
 if test "$wxUSE_PROTOCOL" = "yes"; then
-    cat >> confdefs.h <<\EOF
+    if test "$wxUSE_SOCKETS" != "yes"; then
+        echo "configure: warning: Protocol classes require sockets... disabled" 1>&2
+        wxUSE_PROTOCOL=no
+    fi
+
+    if test "$wxUSE_PROTOCOL" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define wxUSE_PROTOCOL 1
 EOF
 
 
-    if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
-        cat >> confdefs.h <<\EOF
+        if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
+            cat >> confdefs.h <<\EOF
 #define wxUSE_PROTOCOL_HTTP 1
 EOF
 
-    fi
-    if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
-        cat >> confdefs.h <<\EOF
+        fi
+        if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
+            cat >> confdefs.h <<\EOF
 #define wxUSE_PROTOCOL_FTP 1
 EOF
 
+        fi
+        if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
+            cat >> confdefs.h <<\EOF
+#define wxUSE_PROTOCOL_FILE 1
+EOF
+
+        fi
+    fi
+fi
+
+if test "$wxUSE_URL" = "yes"; then
+    if test "$wxUSE_PROTOCOL" != "yes"; then
+        echo "configure: warning: wxURL class requires wxProtocol... disabled" 1>&2
+        wxUSE_URL=no
     fi
-    if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
+    if test "$wxUSE_URL" = "yes"; then
         cat >> confdefs.h <<\EOF
-#define wxUSE_PROTOCOL_FILE 1
+#define wxUSE_URL 1
 EOF
 
     fi
@@ -19570,7 +19578,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:19574: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:19582: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6