don't use --enable-protocol(-xxx) w/o sockets

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 6e38123aa5083046e43381cabf083e38eb644fd0..0ac60f549a67fd9ea04a23352eb7182aa61e6690 100755 (executable)
--- a/configure
+++ b/configure
@@ -19190,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
-    if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
+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_URL" = "yes"; then
         cat >> confdefs.h <<\EOF
-#define wxUSE_PROTOCOL_FILE 1
+#define wxUSE_URL 1
 EOF
 
     fi
@@ -19565,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:19569: 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

diff --git a/configure.in b/configure.in
index f98e8df33b8741ac7dd7510157c5ad453dbe1a13..f367306840bdee080f779ee20538ca25b3cffe81 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4646,21 +4646,34 @@ if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
     AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
 fi
 
-if test "$wxUSE_URL" = "yes"; then
-    AC_DEFINE(wxUSE_URL)
-fi
-
 if test "$wxUSE_PROTOCOL" = "yes"; then
-    AC_DEFINE(wxUSE_PROTOCOL)
+    if test "$wxUSE_SOCKETS" != "yes"; then
+        AC_MSG_WARN(Protocol classes require sockets... disabled)
+        wxUSE_PROTOCOL=no
+    fi
+
+    if test "$wxUSE_PROTOCOL" = "yes"; then
+        AC_DEFINE(wxUSE_PROTOCOL)
 
-    if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
-        AC_DEFINE(wxUSE_PROTOCOL_HTTP)
+        if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
+            AC_DEFINE(wxUSE_PROTOCOL_HTTP)
+        fi
+        if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
+            AC_DEFINE(wxUSE_PROTOCOL_FTP)
+        fi
+        if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
+            AC_DEFINE(wxUSE_PROTOCOL_FILE)
+        fi
     fi
-    if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
-        AC_DEFINE(wxUSE_PROTOCOL_FTP)
+fi
+
+if test "$wxUSE_URL" = "yes"; then
+    if test "$wxUSE_PROTOCOL" != "yes"; then
+        AC_MSG_WARN(wxURL class requires wxProtocol... disabled)
+        wxUSE_URL=no
     fi
-    if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
-        AC_DEFINE(wxUSE_PROTOCOL_FILE)
+    if test "$wxUSE_URL" = "yes"; then
+        AC_DEFINE(wxUSE_URL)
     fi
 fi