disable wxSocket for wxX11, doesn't link anyhow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
113
configure
vendored
113
configure
vendored
@@ -9299,7 +9299,7 @@ if eval "test \"`echo '$''{'wx_cv_prog_makeisgnu'+set}'`\" = set"; then
|
||||
else
|
||||
|
||||
if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
|
||||
egrep -s GNU); then
|
||||
egrep -qs GNU); then
|
||||
wx_cv_prog_makeisgnu="yes"
|
||||
else
|
||||
wx_cv_prog_makeisgnu="no"
|
||||
@@ -12242,7 +12242,7 @@ rm -f conftest*
|
||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__"
|
||||
GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$MICROWIN/src/lib/libnano-X.a \$MICROWIN/src/lib/libmwengine.a \$MICROWIN/src/lib/libmwfonts.a \$MICROWIN/src/lib/libmwdrivers.a \$MICROWIN/src/lib/libmwobjects.a"
|
||||
else
|
||||
GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11"
|
||||
GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
|
||||
fi
|
||||
|
||||
TOOLKIT_VPATH="\${top_srcdir}/src/x11"
|
||||
@@ -18595,16 +18595,22 @@ EOF
|
||||
fi
|
||||
|
||||
|
||||
if test "$TOOLKIT" != "MSW"; then
|
||||
if test "$wxUSE_SOCKETS" = "yes"; then
|
||||
if test "$TOOLKIT" = "X11"; then
|
||||
echo "configure: warning: wxSocket not yet supported under X11... disabled" 1>&2
|
||||
wxUSE_SOCKETS="no"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes"; then
|
||||
if test "$wxUSE_SOCKETS" = "yes"; then
|
||||
if test "$TOOLKIT" != "MSW"; then
|
||||
echo $ac_n "checking for socket""... $ac_c" 1>&6
|
||||
echo "configure:18603: checking for socket" >&5
|
||||
echo "configure:18609: checking for socket" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18608 "configure"
|
||||
#line 18614 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char socket(); below. */
|
||||
@@ -18627,7 +18633,7 @@ socket();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:18631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:18637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_socket=yes"
|
||||
else
|
||||
@@ -18645,7 +18651,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
|
||||
echo "configure:18649: checking for socket in -lsocket" >&5
|
||||
echo "configure:18655: checking for socket in -lsocket" >&5
|
||||
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -18653,7 +18659,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsocket $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18657 "configure"
|
||||
#line 18663 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@@ -18664,7 +18670,7 @@ int main() {
|
||||
socket()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:18668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:18674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -18693,11 +18699,12 @@ fi
|
||||
fi
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes" ; then
|
||||
if test "$wxUSE_SOCKETS" = "yes" ; then
|
||||
if test "$TOOLKIT" != "MSW"; then
|
||||
echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
|
||||
echo "configure:18701: checking what is the type of the third argument of getsockname" >&5
|
||||
echo "configure:18708: checking what is the type of the third argument of getsockname" >&5
|
||||
if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -18712,7 +18719,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
|
||||
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18716 "configure"
|
||||
#line 18723 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
@@ -18725,7 +18732,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:18729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:18736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wx_cv_type_getsockname3=socklen_t
|
||||
else
|
||||
@@ -18733,7 +18740,7 @@ else
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18737 "configure"
|
||||
#line 18744 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
@@ -18746,7 +18753,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:18750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:18757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wx_cv_type_getsockname3=size_t
|
||||
else
|
||||
@@ -18754,7 +18761,7 @@ else
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18758 "configure"
|
||||
#line 18765 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
@@ -18767,7 +18774,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:18771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:18778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wx_cv_type_getsockname3=int
|
||||
else
|
||||
@@ -18839,17 +18846,17 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:18843: checking for $ac_hdr" >&5
|
||||
echo "configure:18850: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18848 "configure"
|
||||
#line 18855 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:18853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:18860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@@ -18903,12 +18910,12 @@ if test "$TOOLKIT" != "MSW"; then
|
||||
for ac_func in dlopen
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:18907: checking for $ac_func" >&5
|
||||
echo "configure:18914: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18912 "configure"
|
||||
#line 18919 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@@ -18931,7 +18938,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:18935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:18942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
@@ -18959,7 +18966,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:18963: checking for dlopen in -ldl" >&5
|
||||
echo "configure:18970: checking for dlopen in -ldl" >&5
|
||||
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -18967,7 +18974,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18971 "configure"
|
||||
#line 18978 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@@ -18978,7 +18985,7 @@ int main() {
|
||||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:18982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:18989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -19007,12 +19014,12 @@ else
|
||||
for ac_func in shl_load
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:19011: checking for $ac_func" >&5
|
||||
echo "configure:19018: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19016 "configure"
|
||||
#line 19023 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@@ -19035,7 +19042,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:19046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
@@ -19063,7 +19070,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
|
||||
echo "configure:19067: checking for dld in -lshl_load" >&5
|
||||
echo "configure:19074: checking for dld in -lshl_load" >&5
|
||||
ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -19071,7 +19078,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lshl_load $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19075 "configure"
|
||||
#line 19082 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@@ -19082,7 +19089,7 @@ int main() {
|
||||
dld()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:19093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -19121,12 +19128,12 @@ done
|
||||
for ac_func in dlerror
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:19125: checking for $ac_func" >&5
|
||||
echo "configure:19132: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19130 "configure"
|
||||
#line 19137 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@@ -19149,7 +19156,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:19160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
@@ -19174,7 +19181,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:19178: checking for dlerror in -ldl" >&5
|
||||
echo "configure:19185: checking for dlerror in -ldl" >&5
|
||||
ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -19182,7 +19189,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19186 "configure"
|
||||
#line 19193 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@@ -19193,7 +19200,7 @@ int main() {
|
||||
dlerror()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:19204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -19264,7 +19271,7 @@ EOF
|
||||
|
||||
if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
|
||||
echo $ac_n "checking for main in -lunicows""... $ac_c" 1>&6
|
||||
echo "configure:19268: checking for main in -lunicows" >&5
|
||||
echo "configure:19275: checking for main in -lunicows" >&5
|
||||
ac_lib_var=`echo unicows'_'main | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -19272,14 +19279,14 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lunicows $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19276 "configure"
|
||||
#line 19283 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:19290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@@ -19360,7 +19367,7 @@ fi
|
||||
|
||||
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
|
||||
if test "$wxUSE_UNIVERSAL" = "yes"; then
|
||||
echo "configure: warning: MDI not yet supported for wxUNIVERSAL... disabled" 1>&2
|
||||
echo "configure: warning: MDI not yet supported for wxUniversal... disabled" 1>&2
|
||||
wxUSE_MDI_ARCHITECTURE=no
|
||||
fi
|
||||
|
||||
@@ -19395,17 +19402,17 @@ EOF
|
||||
if test "$wxUSE_MS_HTML_HELP" = "yes"; then
|
||||
ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6
|
||||
echo "configure:19399: checking for htmlhelp.h" >&5
|
||||
echo "configure:19406: checking for htmlhelp.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19404 "configure"
|
||||
#line 19411 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <htmlhelp.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:19409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:19416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@@ -19493,17 +19500,17 @@ if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:19497: checking for $ac_hdr" >&5
|
||||
echo "configure:19504: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19502 "configure"
|
||||
#line 19509 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:19507: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:19514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@@ -19920,7 +19927,7 @@ if test "$wxUSE_TOGGLEBTN" = "yes"; then
|
||||
wxUSE_TOGGLEBTN=no
|
||||
fi
|
||||
if test "$wxUSE_UNIVERSAL" = "yes"; then
|
||||
echo "configure: warning: Toggle button not yet supported under wxUNIVERSAL... disabled" 1>&2
|
||||
echo "configure: warning: Toggle button not yet supported under wxUniversal... disabled" 1>&2
|
||||
wxUSE_TOGGLEBTN=no
|
||||
fi
|
||||
|
||||
@@ -19972,7 +19979,7 @@ if test "$wxUSE_TOOLTIPS" = "yes"; then
|
||||
echo "configure: warning: wxTooltip not supported under WINE... disabled" 1>&2
|
||||
else
|
||||
if test "$wxUSE_UNIVERSAL" = "yes"; then
|
||||
echo "configure: warning: wxTooltip not supported yet in wxUNIVERSAL... disabled" 1>&2
|
||||
echo "configure: warning: wxTooltip not supported yet in wxUniversal... disabled" 1>&2
|
||||
else
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define wxUSE_TOOLTIPS 1
|
||||
@@ -20484,7 +20491,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:20488: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo "configure:20495: 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
|
||||
|
||||
21
configure.in
21
configure.in
@@ -1900,7 +1900,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
|
||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__"
|
||||
GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$MICROWIN/src/lib/libnano-X.a \$MICROWIN/src/lib/libmwengine.a \$MICROWIN/src/lib/libmwfonts.a \$MICROWIN/src/lib/libmwdrivers.a \$MICROWIN/src/lib/libmwobjects.a"
|
||||
else
|
||||
GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11"
|
||||
GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
|
||||
fi
|
||||
|
||||
TOOLKIT_VPATH="\${top_srcdir}/src/x11"
|
||||
@@ -3723,10 +3723,17 @@ dnl ------------------------------------------------------------------------
|
||||
dnl wxSocket
|
||||
dnl ------------------------------------------------------------------------
|
||||
|
||||
dnl under MSW we always have sockets
|
||||
if test "$TOOLKIT" != "MSW"; then
|
||||
dnl VZ: the GUI hooks wxSocket needs are not implemented yet in wxX11
|
||||
if test "$wxUSE_SOCKETS" = "yes"; then
|
||||
if test "$TOOLKIT" = "X11"; then
|
||||
AC_MSG_WARN([wxSocket not yet supported under X11... disabled])
|
||||
wxUSE_SOCKETS="no"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes"; then
|
||||
if test "$wxUSE_SOCKETS" = "yes"; then
|
||||
dnl under MSW we always have sockets
|
||||
if test "$TOOLKIT" != "MSW"; then
|
||||
dnl under Solaris, socket functions live in -lsocket
|
||||
AC_CHECK_FUNC(socket,,
|
||||
AC_CHECK_LIB(socket, socket,
|
||||
@@ -3738,12 +3745,13 @@ if test "$TOOLKIT" != "MSW"; then
|
||||
)
|
||||
)
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes" ; then
|
||||
dnl this test may be appropriate if building under cygwin
|
||||
dnl right now I'm assuming it also uses the winsock stuff
|
||||
dnl like mingw does.. -- RL
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes" ; then
|
||||
if test "$TOOLKIT" != "MSW"; then
|
||||
dnl determine the type of third argument for getsockname
|
||||
AC_CACHE_CHECK([what is the type of the third argument of getsockname],
|
||||
wx_cv_type_getsockname3,
|
||||
@@ -3797,7 +3805,6 @@ if test "$TOOLKIT" != "MSW"; then
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
dnl if !MSW
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_SOCKETS)
|
||||
|
||||
Reference in New Issue
Block a user