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

corrected shared library linking for Darwin (dylib initialisation routine)

Browse Source 
disabled joystick for wxMAC and wxMOTIF (not yet implemented)
unified configure warning messages


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-11-26 21:21:50 +00:00
parent 4cd1a81804
commit 156b252383
2 changed files with 97 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
configure vendored
View File

@@ -11961,9 +11961,9 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6
;; ;;
*-*-darwin* ) *-*-darwin* )
CFLAGS="$CFLAGS -fno-common" CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
CXXFLAGS="$CXXFLAGS -fno-common" CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
SHARED_LD="$CXX -dynamiclib -o" SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
PIC_FLAG="-dynamic -fPIC" PIC_FLAG="-dynamic -fPIC"
;; ;;
@@ -15338,10 +15338,10 @@ if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_THREADS" = "yes" ; then if test "$wxUSE_THREADS" = "yes" ; then
if test "$wxUSE_WINE" = 1 ; then if test "$wxUSE_WINE" = 1 ; then
echo "configure: warning: Threads are not supported under WINE" 1>&2 echo "configure: warning: Threads are not supported under WINE... disabled" 1>&2
wxUSE_THREADS="no" wxUSE_THREADS="no"
elif test "$USE_BEOS" = 1; then elif test "$USE_BEOS" = 1; then
echo "configure: warning: BeOS threads are not yet supported" 1>&2 echo "configure: warning: BeOS threads are not yet supported... disabled" 1>&2
wxUSE_THREADS="no" wxUSE_THREADS="no"
fi fi
fi fi
@@ -15482,7 +15482,7 @@ fi
if test -z "$THREADS_OBJ" ; then if test -z "$THREADS_OBJ" ; then
wxUSE_THREADS=no wxUSE_THREADS=no
echo "configure: warning: No thread support on this system" 1>&2 echo "configure: warning: No thread support on this system... disabled" 1>&2
fi fi
fi fi
@@ -16340,7 +16340,7 @@ fi
if test "$wxUSE_TEXTFILE" = "yes"; then if test "$wxUSE_TEXTFILE" = "yes"; then
if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then
echo "configure: warning: wxTextFile requires wxFile and wxTextBuffer and won't be compiled without them" 1>&2 echo "configure: warning: wxTextFile requires wxFile and wxTextBuffer... disabled" 1>&2
else else
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define wxUSE_TEXTFILE 1 #define wxUSE_TEXTFILE 1
@@ -16351,7 +16351,7 @@ fi
if test "$wxUSE_CONFIG" = "yes" ; then if test "$wxUSE_CONFIG" = "yes" ; then
if test "$wxUSE_TEXTFILE" != "yes"; then if test "$wxUSE_TEXTFILE" != "yes"; then
echo "configure: warning: wxConfig requires wxTextFile and it won't be compiled without it" 1>&2 echo "configure: warning: wxConfig requires wxTextFile... disabled" 1>&2
else else
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define wxUSE_CONFIG 1 #define wxUSE_CONFIG 1
@@ -16363,7 +16363,7 @@ fi
if test "$wxUSE_INTL" = "yes" ; then if test "$wxUSE_INTL" = "yes" ; then
if test "$wxUSE_FILE" != "yes"; then if test "$wxUSE_FILE" != "yes"; then
echo "configure: warning: I18n code requires wxFile and it won't be compiled without it" 1>&2 echo "configure: warning: I18n code requires wxFile... disabled" 1>&2
else else
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define wxUSE_INTL 1 #define wxUSE_INTL 1
@@ -17065,23 +17065,32 @@ fi
if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_GUI" = "yes"; then
if test "$TOOLKIT" = "MAC"; then
echo "configure: warning: Joystick not yet supported under Mac OS X... disabled" 1>&2
wxUSE_JOYSTICK=no
fi
if test "$TOOLKIT" = "MOTIF"; then
echo "configure: warning: Joystick not yet supported under Motif... disabled" 1>&2
wxUSE_JOYSTICK=no
fi
if test "$TOOLKIT" != "MSW"; then if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_JOYSTICK" = "yes"; then if test "$wxUSE_JOYSTICK" = "yes"; then
for ac_hdr in linux/joystick.h for ac_hdr in linux/joystick.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:17075: checking for $ac_hdr" >&5 echo "configure:17084: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17080 "configure" #line 17089 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:17085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:17094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@@ -17109,7 +17118,7 @@ done
if test "$ac_cv_header_linux_joystick_h" != "yes"; then if test "$ac_cv_header_linux_joystick_h" != "yes"; then
wxUSE_JOYSTICK=no wxUSE_JOYSTICK=no
echo "configure: warning: Joystick not supported by this system" 1>&2 echo "configure: warning: Joystick not supported by this system... disabled" 1>&2
fi fi
fi fi
fi fi
@@ -17135,12 +17144,12 @@ if test "$TOOLKIT" != "MSW"; then
for ac_func in dlopen for ac_func in dlopen
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:17139: checking for $ac_func" >&5 echo "configure:17148: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17144 "configure" #line 17153 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@@ -17163,7 +17172,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:17167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:17176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@@ -17191,7 +17200,7 @@ EOF
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "configure:17195: checking for dlopen in -ldl" >&5 echo "configure:17204: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@@ -17199,7 +17208,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS" LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17203 "configure" #line 17212 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@@ -17210,7 +17219,7 @@ int main() {
dlopen() dlopen()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:17214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:17223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@@ -17239,12 +17248,12 @@ else
for ac_func in shl_load for ac_func in shl_load
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:17243: checking for $ac_func" >&5 echo "configure:17252: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17248 "configure" #line 17257 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@@ -17267,7 +17276,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:17271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:17280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@@ -17295,7 +17304,7 @@ EOF
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
echo "configure:17299: checking for dld in -lshl_load" >&5 echo "configure:17308: checking for dld in -lshl_load" >&5
ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'` ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@@ -17303,7 +17312,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lshl_load $LIBS" LIBS="-lshl_load $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17307 "configure" #line 17316 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@@ -17314,7 +17323,7 @@ int main() {
dld() dld()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:17318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:17327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@@ -17353,12 +17362,12 @@ done
for ac_func in dlerror for ac_func in dlerror
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:17357: checking for $ac_func" >&5 echo "configure:17366: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17362 "configure" #line 17371 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@@ -17381,7 +17390,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:17385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:17394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@@ -17406,7 +17415,7 @@ EOF
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
echo "configure:17410: checking for dlerror in -ldl" >&5 echo "configure:17419: checking for dlerror in -ldl" >&5
ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'` ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@@ -17414,7 +17423,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS" LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17418 "configure" #line 17427 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@@ -17425,7 +17434,7 @@ int main() {
dlerror() dlerror()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:17429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:17438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@@ -17547,7 +17556,7 @@ fi
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
if test "$wxUSE_UNIVERSAL" = "yes"; then if test "$wxUSE_UNIVERSAL" = "yes"; then
echo "configure: warning: MDI is not supported for wxUNIVERSAL yet... disabled" 1>&2 echo "configure: warning: MDI not yet supported for wxUNIVERSAL... disabled" 1>&2
wxUSE_MDI_ARCHITECTURE=no wxUSE_MDI_ARCHITECTURE=no
fi fi
@@ -17582,17 +17591,17 @@ EOF
if test "$wxUSE_MS_HTML_HELP" = "yes"; then if test "$wxUSE_MS_HTML_HELP" = "yes"; then
ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6 echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6
echo "configure:17586: checking for htmlhelp.h" >&5 echo "configure:17595: checking for htmlhelp.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17591 "configure" #line 17600 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <htmlhelp.h> #include <htmlhelp.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:17596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:17605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@@ -17680,17 +17689,17 @@ if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:17684: checking for $ac_hdr" >&5 echo "configure:17693: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 17689 "configure" #line 17698 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:17694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:17703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@@ -17756,7 +17765,7 @@ fi
if test "$wxUSE_IPC" = "yes"; then if test "$wxUSE_IPC" = "yes"; then
if test "$wxUSE_SOCKETS" != "yes"; then if test "$wxUSE_SOCKETS" != "yes"; then
echo "configure: warning: wxWindows IPC classes require sockets" 1>&2 echo "configure: warning: wxWindows IPC classes require sockets... disabled" 1>&2
fi fi
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
@@ -17780,18 +17789,18 @@ fi
if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
if test "$wxUSE_GTK" = 1; then if test "$wxUSE_GTK" = 1; then
if test "$WXGTK12" != 1; then if test "$WXGTK12" != 1; then
echo "configure: warning: Drag and drop is only supported under GTK+ 1.2" 1>&2 echo "configure: warning: Drag and drop is only supported under GTK+ 1.2... disabled" 1>&2
wxUSE_DRAG_AND_DROP=no wxUSE_DRAG_AND_DROP=no
fi fi
fi fi
if test "$wxUSE_MOTIF" = 1; then if test "$wxUSE_MOTIF" = 1; then
echo "configure: warning: Drag and drop is not yet supported under Motif" 1>&2 echo "configure: warning: Drag and drop not yet supported under Motif... disabled" 1>&2
wxUSE_DRAG_AND_DROP=no wxUSE_DRAG_AND_DROP=no
fi fi
if test "$wxUSE_MAC" = 1; then if test "$wxUSE_MAC" = 1; then
echo "configure: warning: Drag and drop is not yet supported under Mac OS X" 1>&2 echo "configure: warning: Drag and drop not yet supported under Mac OS X... disabled" 1>&2
wxUSE_DRAG_AND_DROP=no wxUSE_DRAG_AND_DROP=no
fi fi
@@ -18095,8 +18104,12 @@ EOF
fi fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then if test "$wxUSE_TOGGLEBTN" = "yes"; then
if test "$wxUSE_MAC" = 1 -o "$wxUSE_UNIVERSAL" = "yes"; then if test "$wxUSE_MAC" = 1; then
echo "configure: warning: Toggle button not yet supported under Mac OS X or wxUNIVERSAL... disabled" 1>&2 echo "configure: warning: Toggle button not yet supported under Mac OS X... disabled" 1>&2
wxUSE_TOGGLEBTN=no
fi
if test "$wxUSE_UNIVERSAL" = "yes"; then
echo "configure: warning: Toggle button not yet supported under wxUNIVERSAL... disabled" 1>&2
wxUSE_TOGGLEBTN=no wxUSE_TOGGLEBTN=no
fi fi
@@ -18174,7 +18187,7 @@ fi
if test "$wxUSE_POPUPWIN" = "yes"; then if test "$wxUSE_POPUPWIN" = "yes"; then
if test "$wxUSE_MAC" = 1; then if test "$wxUSE_MAC" = 1; then
echo "configure: warning: Popup window is not yet supported under Mac OS" 1>&2 echo "configure: warning: Popup window not yet supported under Mac OS X... disabled" 1>&2
else else
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define wxUSE_POPUPWIN 1 #define wxUSE_POPUPWIN 1
@@ -18571,13 +18584,11 @@ 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:18581: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo "configure:18592: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` 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 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6

59
configure.in
View File

@@ -2532,9 +2532,9 @@ if test "$wxUSE_SHARED" = "yes"; then
;; ;;
*-*-darwin* ) *-*-darwin* )
CFLAGS="$CFLAGS -fno-common" CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
CXXFLAGS="$CXXFLAGS -fno-common" CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
SHARED_LD="$CXX -dynamiclib -o" SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
PIC_FLAG="-dynamic -fPIC" PIC_FLAG="-dynamic -fPIC"
;; ;;
@@ -3233,10 +3233,10 @@ if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_THREADS" = "yes" ; then if test "$wxUSE_THREADS" = "yes" ; then
if test "$wxUSE_WINE" = 1 ; then if test "$wxUSE_WINE" = 1 ; then
AC_MSG_WARN([Threads are not supported under WINE]) AC_MSG_WARN([Threads are not supported under WINE... disabled])
wxUSE_THREADS="no" wxUSE_THREADS="no"
elif test "$USE_BEOS" = 1; then elif test "$USE_BEOS" = 1; then
AC_MSG_WARN([BeOS threads are not yet supported]) AC_MSG_WARN([BeOS threads are not yet supported... disabled])
wxUSE_THREADS="no" wxUSE_THREADS="no"
fi fi
fi fi
@@ -3272,7 +3272,7 @@ if test "$TOOLKIT" != "MSW"; then
if test -z "$THREADS_OBJ" ; then if test -z "$THREADS_OBJ" ; then
wxUSE_THREADS=no wxUSE_THREADS=no
AC_MSG_WARN(No thread support on this system) AC_MSG_WARN([No thread support on this system... disabled])
fi fi
fi fi
@@ -3650,7 +3650,7 @@ fi
if test "$wxUSE_TEXTFILE" = "yes"; then if test "$wxUSE_TEXTFILE" = "yes"; then
if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then
AC_MSG_WARN(wxTextFile requires wxFile and wxTextBuffer and won't be compiled without them) AC_MSG_WARN(wxTextFile requires wxFile and wxTextBuffer... disabled)
else else
AC_DEFINE(wxUSE_TEXTFILE) AC_DEFINE(wxUSE_TEXTFILE)
fi fi
@@ -3658,7 +3658,7 @@ fi
if test "$wxUSE_CONFIG" = "yes" ; then if test "$wxUSE_CONFIG" = "yes" ; then
if test "$wxUSE_TEXTFILE" != "yes"; then if test "$wxUSE_TEXTFILE" != "yes"; then
AC_MSG_WARN(wxConfig requires wxTextFile and it won't be compiled without it) AC_MSG_WARN(wxConfig requires wxTextFile... disabled)
else else
AC_DEFINE(wxUSE_CONFIG) AC_DEFINE(wxUSE_CONFIG)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
@@ -3667,7 +3667,7 @@ fi
if test "$wxUSE_INTL" = "yes" ; then if test "$wxUSE_INTL" = "yes" ; then
if test "$wxUSE_FILE" != "yes"; then if test "$wxUSE_FILE" != "yes"; then
AC_MSG_WARN(I18n code requires wxFile and it won't be compiled without it) AC_MSG_WARN(I18n code requires wxFile... disabled)
else else
AC_DEFINE(wxUSE_INTL) AC_DEFINE(wxUSE_INTL)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
@@ -3935,6 +3935,15 @@ dnl ---------------------------------------------------------------------------
if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_GUI" = "yes"; then
if test "$TOOLKIT" = "MAC"; then
AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
wxUSE_JOYSTICK=no
fi
if test "$TOOLKIT" = "MOTIF"; then
AC_MSG_WARN([Joystick not yet supported under Motif... disabled])
wxUSE_JOYSTICK=no
fi
dnl under MSW we always have joystick support dnl under MSW we always have joystick support
if test "$TOOLKIT" != "MSW"; then if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_JOYSTICK" = "yes"; then if test "$wxUSE_JOYSTICK" = "yes"; then
@@ -3942,7 +3951,7 @@ if test "$wxUSE_GUI" = "yes"; then
AC_CHECK_HEADERS(linux/joystick.h) AC_CHECK_HEADERS(linux/joystick.h)
if test "$ac_cv_header_linux_joystick_h" != "yes"; then if test "$ac_cv_header_linux_joystick_h" != "yes"; then
wxUSE_JOYSTICK=no wxUSE_JOYSTICK=no
AC_MSG_WARN(Joystick not supported by this system, disabled) AC_MSG_WARN(Joystick not supported by this system... disabled)
fi fi
fi fi
fi fi
@@ -4084,7 +4093,7 @@ fi
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
if test "$wxUSE_UNIVERSAL" = "yes"; then if test "$wxUSE_UNIVERSAL" = "yes"; then
AC_MSG_WARN(MDI is not supported for wxUNIVERSAL yet... disabled) AC_MSG_WARN(MDI not yet supported for wxUNIVERSAL... disabled)
wxUSE_MDI_ARCHITECTURE=no wxUSE_MDI_ARCHITECTURE=no
fi fi
@@ -4191,7 +4200,7 @@ fi
if test "$wxUSE_IPC" = "yes"; then if test "$wxUSE_IPC" = "yes"; then
if test "$wxUSE_SOCKETS" != "yes"; then if test "$wxUSE_SOCKETS" != "yes"; then
AC_MSG_WARN(wxWindows IPC classes require sockets, disabled) AC_MSG_WARN(wxWindows IPC classes require sockets... disabled)
fi fi
AC_DEFINE(wxUSE_IPC) AC_DEFINE(wxUSE_IPC)
@@ -4207,18 +4216,18 @@ fi
if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
if test "$wxUSE_GTK" = 1; then if test "$wxUSE_GTK" = 1; then
if test "$WXGTK12" != 1; then if test "$WXGTK12" != 1; then
AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2]) AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2... disabled])
wxUSE_DRAG_AND_DROP=no wxUSE_DRAG_AND_DROP=no
fi fi
fi fi
if test "$wxUSE_MOTIF" = 1; then if test "$wxUSE_MOTIF" = 1; then
AC_MSG_WARN([Drag and drop is not yet supported under Motif]) AC_MSG_WARN([Drag and drop not yet supported under Motif... disabled])
wxUSE_DRAG_AND_DROP=no wxUSE_DRAG_AND_DROP=no
fi fi
if test "$wxUSE_MAC" = 1; then if test "$wxUSE_MAC" = 1; then
AC_MSG_WARN([Drag and drop is not yet supported under Mac OS X]) AC_MSG_WARN([Drag and drop not yet supported under Mac OS X... disabled])
wxUSE_DRAG_AND_DROP=no wxUSE_DRAG_AND_DROP=no
fi fi
@@ -4423,8 +4432,12 @@ if test "$wxUSE_TEXTCTRL" = "yes"; then
fi fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then if test "$wxUSE_TOGGLEBTN" = "yes"; then
if test "$wxUSE_MAC" = 1 -o "$wxUSE_UNIVERSAL" = "yes"; then if test "$wxUSE_MAC" = 1; then
AC_MSG_WARN([Toggle button not yet supported under Mac OS X or wxUNIVERSAL... disabled]) AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
wxUSE_TOGGLEBTN=no
fi
if test "$wxUSE_UNIVERSAL" = "yes"; then
AC_MSG_WARN([Toggle button not yet supported under wxUNIVERSAL... disabled])
wxUSE_TOGGLEBTN=no wxUSE_TOGGLEBTN=no
fi fi
@@ -4459,13 +4472,13 @@ fi
if test "$wxUSE_TOOLTIPS" = "yes"; then if test "$wxUSE_TOOLTIPS" = "yes"; then
if test "$wxUSE_MOTIF" = 1; then if test "$wxUSE_MOTIF" = 1; then
AC_MSG_WARN(wxTooltip not supported yet under Motif ... disabled) AC_MSG_WARN([wxTooltip not supported yet under Motif... disabled])
else else
if test "$wxUSE_WINE" = 1; then if test "$wxUSE_WINE" = 1; then
AC_MSG_WARN(wxTooltip not supported under WINE ... disabled) AC_MSG_WARN([wxTooltip not supported under WINE... disabled])
else else
if test "$wxUSE_UNIVERSAL" = "yes"; then if test "$wxUSE_UNIVERSAL" = "yes"; then
AC_MSG_WARN(wxTooltip not supported yet in wxUNIVERSAL ... disabled) AC_MSG_WARN([wxTooltip not supported yet in wxUNIVERSAL... disabled])
else else
AC_DEFINE(wxUSE_TOOLTIPS) AC_DEFINE(wxUSE_TOOLTIPS)
fi fi
@@ -4485,7 +4498,7 @@ fi
if test "$wxUSE_POPUPWIN" = "yes"; then if test "$wxUSE_POPUPWIN" = "yes"; then
if test "$wxUSE_MAC" = 1; then if test "$wxUSE_MAC" = 1; then
AC_MSG_WARN(Popup window is not yet supported under Mac OS) AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
else else
AC_DEFINE(wxUSE_POPUPWIN) AC_DEFINE(wxUSE_POPUPWIN)
USES_CONTROLS=1 USES_CONTROLS=1
@@ -4847,10 +4860,8 @@ AC_SUBST(LD)
AC_SUBST(MAKEINFO) AC_SUBST(MAKEINFO)
AC_SUBST(INSTALL_LIBRARY) AC_SUBST(INSTALL_LIBRARY)
dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
dnl itself (this is macro is required if SUBDIRS variable is used in Makefile.am dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am
dnl - and we do use it) dnl - and we do use it)
AC_PROG_MAKE_SET AC_PROG_MAKE_SET