Don't add -MMD until we are just about ready to build the lib, it messes with
configure tests for RH's broken '2.96' compiler, and really doesn't belong in CFLAGS before then anyway. Made wxBaseArray dtor always non-virtual. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
parent
9864c56ded
commit
88e30f2b71
144
configure
vendored
144
configure
vendored
@ -16032,7 +16032,7 @@ if test "$wxUSE_PROFILE" = "yes" ; then
|
||||
PROFILE=" -pg"
|
||||
fi
|
||||
|
||||
if test "$GCC" = yes ; then
|
||||
if test "$GCC" = "yes" ; then
|
||||
if test "$wxUSE_NO_RTTI" = "yes" ; then
|
||||
CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti"
|
||||
fi
|
||||
@ -16042,10 +16042,6 @@ if test "$GCC" = yes ; then
|
||||
if test "$wxUSE_PERMISSIVE" = "yes" ; then
|
||||
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
|
||||
fi
|
||||
if test "$wxUSE_NO_DEPS" = "no" ; then
|
||||
CFLAGS="-MMD $CFLAGS"
|
||||
CXXFLAGS="-MMD $CXXFLAGS"
|
||||
fi
|
||||
if test "$USE_WIN32" = 1 ; then
|
||||
# I'm not even really sure what this was ever added to solve,
|
||||
# but someone added it for mingw native builds, so I guess
|
||||
@ -16328,12 +16324,12 @@ if test "$wxUSE_DATETIME" = "yes"; then
|
||||
for ac_func in strptime
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:16332: checking for $ac_func" >&5
|
||||
echo "configure:16328: 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 16337 "configure"
|
||||
#line 16333 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -16356,7 +16352,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:16356: \"$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
|
||||
@ -16382,13 +16378,13 @@ done
|
||||
|
||||
|
||||
echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
|
||||
echo "configure:16386: checking for timezone variable in <time.h>" >&5
|
||||
echo "configure:16382: checking for timezone variable in <time.h>" >&5
|
||||
if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16392 "configure"
|
||||
#line 16388 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <time.h>
|
||||
@ -16400,7 +16396,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:16400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
|
||||
wx_cv_var_timezone=timezone
|
||||
@ -16411,7 +16407,7 @@ else
|
||||
rm -rf conftest*
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16415 "configure"
|
||||
#line 16411 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <time.h>
|
||||
@ -16423,7 +16419,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:16423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
|
||||
wx_cv_var_timezone=_timezone
|
||||
@ -16434,7 +16430,7 @@ else
|
||||
rm -rf conftest*
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16438 "configure"
|
||||
#line 16434 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <time.h>
|
||||
@ -16446,7 +16442,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:16446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
|
||||
wx_cv_var_timezone=__timezone
|
||||
@ -16481,12 +16477,12 @@ EOF
|
||||
for ac_func in localtime
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:16485: checking for $ac_func" >&5
|
||||
echo "configure:16481: 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 16490 "configure"
|
||||
#line 16486 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -16509,7 +16505,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:16509: \"$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
|
||||
@ -16536,13 +16532,13 @@ done
|
||||
|
||||
if test "$ac_cv_func_localtime" = "yes"; then
|
||||
echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
|
||||
echo "configure:16540: checking for tm_gmtoff in struct tm" >&5
|
||||
echo "configure:16536: checking for tm_gmtoff in struct tm" >&5
|
||||
if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16546 "configure"
|
||||
#line 16542 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <time.h>
|
||||
@ -16554,7 +16550,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:16554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
|
||||
wx_cv_struct_tm_has_gmtoff=yes
|
||||
@ -16583,12 +16579,12 @@ EOF
|
||||
for ac_func in gettimeofday ftime
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:16587: checking for $ac_func" >&5
|
||||
echo "configure:16583: 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 16592 "configure"
|
||||
#line 16588 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -16611,7 +16607,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:16611: \"$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
|
||||
@ -16638,7 +16634,7 @@ done
|
||||
|
||||
if test "$ac_cv_func_gettimeofday" = "yes"; then
|
||||
echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
|
||||
echo "configure:16642: checking whether gettimeofday takes two arguments" >&5
|
||||
echo "configure:16638: checking whether gettimeofday takes two arguments" >&5
|
||||
if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -16653,7 +16649,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
|
||||
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16657 "configure"
|
||||
#line 16653 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/time.h>
|
||||
@ -16666,7 +16662,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:16666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wx_cv_func_gettimeofday_has_2_args=yes
|
||||
else
|
||||
@ -16674,7 +16670,7 @@ else
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16678 "configure"
|
||||
#line 16674 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/time.h>
|
||||
@ -16687,7 +16683,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:16687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wx_cv_func_gettimeofday_has_2_args=no
|
||||
else
|
||||
@ -16736,12 +16732,12 @@ if test "$TOOLKIT" != "MSW"; then
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes"; then
|
||||
echo $ac_n "checking for socket""... $ac_c" 1>&6
|
||||
echo "configure:16740: checking for socket" >&5
|
||||
echo "configure:16736: 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 16745 "configure"
|
||||
#line 16741 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char socket(); below. */
|
||||
@ -16764,7 +16760,7 @@ socket();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:16764: \"$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
|
||||
@ -16782,7 +16778,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:16786: checking for socket in -lsocket" >&5
|
||||
echo "configure:16782: 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
|
||||
@ -16790,7 +16786,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsocket $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16794 "configure"
|
||||
#line 16790 "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
|
||||
@ -16801,7 +16797,7 @@ int main() {
|
||||
socket()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:16801: \"$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
|
||||
@ -16834,7 +16830,7 @@ fi
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes" ; then
|
||||
echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
|
||||
echo "configure:16838: checking what is the type of the third argument of getsockname" >&5
|
||||
echo "configure:16834: 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
|
||||
@ -16849,7 +16845,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
|
||||
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16853 "configure"
|
||||
#line 16849 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -16862,7 +16858,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:16862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wx_cv_type_getsockname3=socklen_t
|
||||
else
|
||||
@ -16870,7 +16866,7 @@ else
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16874 "configure"
|
||||
#line 16870 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -16883,7 +16879,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:16883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wx_cv_type_getsockname3=size_t
|
||||
else
|
||||
@ -16891,7 +16887,7 @@ else
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16895 "configure"
|
||||
#line 16891 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -16904,7 +16900,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:16904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wx_cv_type_getsockname3=int
|
||||
else
|
||||
@ -16963,17 +16959,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:16967: checking for $ac_hdr" >&5
|
||||
echo "configure:16963: 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 16972 "configure"
|
||||
#line 16968 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:16977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:16973: \"$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*
|
||||
@ -17027,12 +17023,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:17031: checking for $ac_func" >&5
|
||||
echo "configure:17027: 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 17036 "configure"
|
||||
#line 17032 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -17055,7 +17051,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:17055: \"$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
|
||||
@ -17083,7 +17079,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:17087: checking for dlopen in -ldl" >&5
|
||||
echo "configure:17083: 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
|
||||
@ -17091,7 +17087,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17095 "configure"
|
||||
#line 17091 "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
|
||||
@ -17102,7 +17098,7 @@ int main() {
|
||||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:17102: \"$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
|
||||
@ -17131,12 +17127,12 @@ else
|
||||
for ac_func in shl_load
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:17135: checking for $ac_func" >&5
|
||||
echo "configure:17131: 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 17140 "configure"
|
||||
#line 17136 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -17159,7 +17155,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:17159: \"$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
|
||||
@ -17187,7 +17183,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
|
||||
echo "configure:17191: checking for dld in -lshl_load" >&5
|
||||
echo "configure:17187: 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
|
||||
@ -17195,7 +17191,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lshl_load $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17199 "configure"
|
||||
#line 17195 "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
|
||||
@ -17206,7 +17202,7 @@ int main() {
|
||||
dld()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:17206: \"$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
|
||||
@ -17245,12 +17241,12 @@ done
|
||||
for ac_func in dlerror
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:17249: checking for $ac_func" >&5
|
||||
echo "configure:17245: 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 17254 "configure"
|
||||
#line 17250 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -17273,7 +17269,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:17273: \"$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
|
||||
@ -17298,7 +17294,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:17302: checking for dlerror in -ldl" >&5
|
||||
echo "configure:17298: 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
|
||||
@ -17306,7 +17302,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17310 "configure"
|
||||
#line 17306 "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
|
||||
@ -17317,7 +17313,7 @@ int main() {
|
||||
dlerror()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:17317: \"$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
|
||||
@ -17474,17 +17470,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:17478: checking for htmlhelp.h" >&5
|
||||
echo "configure:17474: 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 17483 "configure"
|
||||
#line 17479 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <htmlhelp.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:17488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:17484: \"$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*
|
||||
@ -17572,17 +17568,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:17576: checking for $ac_hdr" >&5
|
||||
echo "configure:17572: 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 17581 "configure"
|
||||
#line 17577 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:17586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:17582: \"$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*
|
||||
@ -18362,7 +18358,13 @@ fi
|
||||
|
||||
if test "$GXX" = yes ; then
|
||||
CXXWARNINGS="-Wall"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_NO_DEPS" = "no" ; then
|
||||
CFLAGS="-MMD $CFLAGS"
|
||||
CXXFLAGS="-MMD $CXXFLAGS"
|
||||
fi
|
||||
fi
|
||||
|
||||
EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG$PROFILE $OPTIMISE $INCLUDES"
|
||||
|
||||
CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
|
||||
@ -18456,7 +18458,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:18460: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo "configure:18462: 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
|
||||
|
||||
14
configure.in
14
configure.in
@ -3464,7 +3464,7 @@ if test "$wxUSE_PROFILE" = "yes" ; then
|
||||
PROFILE=" -pg"
|
||||
fi
|
||||
|
||||
if test "$GCC" = yes ; then
|
||||
if test "$GCC" = "yes" ; then
|
||||
if test "$wxUSE_NO_RTTI" = "yes" ; then
|
||||
CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti"
|
||||
fi
|
||||
@ -3474,10 +3474,6 @@ if test "$GCC" = yes ; then
|
||||
if test "$wxUSE_PERMISSIVE" = "yes" ; then
|
||||
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
|
||||
fi
|
||||
if test "$wxUSE_NO_DEPS" = "no" ; then
|
||||
CFLAGS="-MMD $CFLAGS"
|
||||
CXXFLAGS="-MMD $CXXFLAGS"
|
||||
fi
|
||||
if test "$USE_WIN32" = 1 ; then
|
||||
# I'm not even really sure what this was ever added to solve,
|
||||
# but someone added it for mingw native builds, so I guess
|
||||
@ -4687,7 +4683,15 @@ if test "$GXX" = yes ; then
|
||||
CXXWARNINGS="-Wall"
|
||||
dnl should enable this one day...
|
||||
dnl CXXWARNINGS="-Wall -Werror"
|
||||
|
||||
dnl Add this *after* all compile tests, we don't need or want generated
|
||||
dnl depfiles until actually building the lib
|
||||
if test "$wxUSE_NO_DEPS" = "no" ; then
|
||||
CFLAGS="-MMD $CFLAGS"
|
||||
CXXFLAGS="-MMD $CXXFLAGS"
|
||||
fi
|
||||
fi
|
||||
|
||||
EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG$PROFILE $OPTIMISE $INCLUDES"
|
||||
|
||||
CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
|
||||
|
||||
@ -69,10 +69,6 @@ public:
|
||||
/// assignment operator
|
||||
wxBaseArray& operator=(const wxBaseArray& src);
|
||||
/// not virtual, see above
|
||||
/// EXCEPT for Gnu compiler to reduce warnings...
|
||||
#ifdef __GNUG__
|
||||
virtual
|
||||
#endif
|
||||
~wxBaseArray();
|
||||
//@}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user