compilation fix for recent commit

[wxWidgets.git] / configure

diff --git a/configure b/configure
index d30a42673351f4f04168bcbba7a8d095cc5b639c..0ac60f549a67fd9ea04a23352eb7182aa61e6690 100755 (executable)
--- a/configure
+++ b/configure
@@ -18732,11 +18732,6 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
         wxUSE_DRAG_AND_DROP=no
     fi
 
         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
     if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
         cat >> confdefs.h <<\EOF
 #define wxUSE_DRAG_AND_DROP 1


@@ -19195,34 +19190,47 @@ EOF
 
 fi
 
 
 fi
 

-if test "$wxUSE_URL" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_URL 1
-EOF
-
-fi
-

 if test "$wxUSE_PROTOCOL" = "yes"; then
 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
 
 
 #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
 
 #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
 
 #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
     fi

-    if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
+    if test "$wxUSE_URL" = "yes"; then

         cat >> confdefs.h <<\EOF
         cat >> confdefs.h <<\EOF

-#define wxUSE_PROTOCOL_FILE 1
+#define wxUSE_URL 1

 EOF
 
     fi
 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 $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
 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