Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-12-31 23:51:37 +00:00
parent ef0e85f3f1
commit 3954f9cadb
2 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
configure vendored
View File

@@ -19190,11 +19190,10 @@ EOF
fi
if test "$wxUSE_URL" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_URL 1
EOF
if test "$wxUSE_PROTOCOL" = "yes"; then
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
@@ -19222,6 +19221,20 @@ 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_URL" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_URL 1
EOF
fi
fi
if test "$wxUSE_MINIFRAME" = "yes"; then
cat >> confdefs.h <<\EOF
@@ -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

17
configure.in
View File

@@ -4646,8 +4646,10 @@ if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
fi
if test "$wxUSE_URL" = "yes"; then
AC_DEFINE(wxUSE_URL)
if test "$wxUSE_PROTOCOL" = "yes"; then
if test "$wxUSE_SOCKETS" != "yes"; then
AC_MSG_WARN(Protocol classes require sockets... disabled)
wxUSE_PROTOCOL=no
fi
if test "$wxUSE_PROTOCOL" = "yes"; then
@@ -4663,6 +4665,17 @@ if test "$wxUSE_PROTOCOL" = "yes"; then
AC_DEFINE(wxUSE_PROTOCOL_FILE)
fi
fi
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_URL" = "yes"; then
AC_DEFINE(wxUSE_URL)
fi
fi
if test "$wxUSE_MINIFRAME" = "yes"; then
AC_DEFINE(wxUSE_MINIFRAME)