small updates for Linux->Win32 cross compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
801e06d5a8
commit
a0c79abb5d
@ -163,7 +163,7 @@ To cross compile the windows library, do
|
||||
(or whatever you called it)
|
||||
Now run configure. There are two ways to do this
|
||||
-> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw \
|
||||
--enable-dnd=no
|
||||
--enable-dnd=no --without-odbc
|
||||
where --build= should read whatever platform you're building on. Configure
|
||||
will notice that build and host platforms differ, and automatically prepend
|
||||
i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
|
||||
@ -179,6 +179,9 @@ Drag'n'drop is disabled because mingw32 lacks (AFAIK) OLE headers.
|
||||
[ Update: some new mingw32 versions now have a new set of windows header
|
||||
files, which apparently can handle ole. Untested at the moment ]
|
||||
|
||||
ODBC files don't compile as of 13.10.99 - may be this will be fixed by the
|
||||
moment you're reading these lines.
|
||||
|
||||
Configure will conclude that shared libraries are out of the question and
|
||||
opt for a static one. I haven't looked into DLL creation yet.
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# This file was automatically generated by tmake at 16:24, 1999/10/13
|
||||
# This file was automatically generated by tmake at 19:50, 1999/10/13
|
||||
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
|
||||
|
||||
#
|
||||
@ -1935,7 +1935,7 @@ JPEGOBJS = \
|
||||
jquant2.o \
|
||||
jdmerge.o
|
||||
|
||||
IODBCOBJS = \
|
||||
IODBC_OBJS = \
|
||||
catalog.o \
|
||||
connect.o \
|
||||
dlf.o \
|
||||
@ -1961,8 +1961,9 @@ GENERICOBJS = @GENERICOBJS@
|
||||
GENERICDEPS = @GENERICDEPS@
|
||||
UNIXOBJS = @UNIXOBJS@
|
||||
UNIXDEPS = @UNIXDEPS@
|
||||
IODBCOBJS = @IODBCOBJS@
|
||||
|
||||
OBJECTS = @ALL_OBJECTS@ $(IODBCOBJS)
|
||||
OBJECTS = @ALL_OBJECTS@
|
||||
|
||||
DEPFILES = @ALL_DEPFILES@
|
||||
|
||||
|
||||
189
configure
vendored
189
configure
vendored
@ -7961,7 +7961,7 @@ TOOLKIT_DEF="-D__WX${TOOLKIT}__"
|
||||
|
||||
WX_LIBRARY="wx_${TOOLKIT_DIR}"
|
||||
|
||||
ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(JPEGOBJS) \$(PNGOBJS) \$(ZLIBOBJS)"
|
||||
ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(JPEGOBJS) \$(PNGOBJS) \$(ZLIBOBJS) \$(IODBCOBJS)"
|
||||
ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)"
|
||||
ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)"
|
||||
else
|
||||
@ -9652,15 +9652,17 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
|
||||
if test "$USE_UNIX" = 1; then
|
||||
|
||||
for ac_func in vfork
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:9659: checking for $ac_func" >&5
|
||||
echo "configure:9661: 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 9664 "configure"
|
||||
#line 9666 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -9683,7 +9685,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9689: \"$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
|
||||
@ -9712,12 +9714,12 @@ POSIX4_LINK=
|
||||
for ac_func in nanosleep
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:9716: checking for $ac_func" >&5
|
||||
echo "configure:9718: 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 9721 "configure"
|
||||
#line 9723 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -9740,7 +9742,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9746: \"$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
|
||||
@ -9765,7 +9767,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
|
||||
echo "configure:9769: checking for nanosleep in -lposix4" >&5
|
||||
echo "configure:9771: checking for nanosleep in -lposix4" >&5
|
||||
ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -9773,7 +9775,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lposix4 $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9777 "configure"
|
||||
#line 9779 "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
|
||||
@ -9784,7 +9786,7 @@ int main() {
|
||||
nanosleep()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9790: \"$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
|
||||
@ -9812,12 +9814,12 @@ else
|
||||
for ac_func in usleep
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:9816: checking for $ac_func" >&5
|
||||
echo "configure:9818: 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 9821 "configure"
|
||||
#line 9823 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -9840,7 +9842,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9846: \"$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
|
||||
@ -9879,12 +9881,12 @@ done
|
||||
for ac_func in uname gethostname
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:9883: checking for $ac_func" >&5
|
||||
echo "configure:9885: 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 9888 "configure"
|
||||
#line 9890 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -9907,7 +9909,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9913: \"$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
|
||||
@ -9935,12 +9937,12 @@ done
|
||||
for ac_func in strtok_r
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:9939: checking for $ac_func" >&5
|
||||
echo "configure:9941: 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 9944 "configure"
|
||||
#line 9946 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -9963,7 +9965,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9969: \"$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
|
||||
@ -9991,12 +9993,12 @@ done
|
||||
for ac_func in inet_addr
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:9995: checking for $ac_func" >&5
|
||||
echo "configure:9997: 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 10000 "configure"
|
||||
#line 10002 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -10019,7 +10021,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10025: \"$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
|
||||
@ -10046,12 +10048,12 @@ done
|
||||
for ac_func in inet_aton
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:10050: checking for $ac_func" >&5
|
||||
echo "configure:10052: 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 10055 "configure"
|
||||
#line 10057 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -10074,7 +10076,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10080: \"$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
|
||||
@ -10099,7 +10101,7 @@ fi
|
||||
done
|
||||
|
||||
echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
|
||||
echo "configure:10103: checking for inet_aton in -lresolv" >&5
|
||||
echo "configure:10105: checking for inet_aton in -lresolv" >&5
|
||||
ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -10107,7 +10109,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lresolv $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10111 "configure"
|
||||
#line 10113 "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
|
||||
@ -10118,7 +10120,7 @@ int main() {
|
||||
inet_aton()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10124: \"$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
|
||||
@ -10146,6 +10148,8 @@ else
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
cat > confcache <<\EOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@ -10212,7 +10216,7 @@ fi
|
||||
if test "$wxUSE_THREADS" = "yes" ; then
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:10216: checking for pthread_create in -lpthread" >&5
|
||||
echo "configure:10220: checking for pthread_create in -lpthread" >&5
|
||||
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -10220,7 +10224,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10224 "configure"
|
||||
#line 10228 "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
|
||||
@ -10231,7 +10235,7 @@ int main() {
|
||||
pthread_create()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10239: \"$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
|
||||
@ -10254,7 +10258,7 @@ else
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
|
||||
echo "configure:10258: checking for pthread_create in -lc_r" >&5
|
||||
echo "configure:10262: checking for pthread_create in -lc_r" >&5
|
||||
ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -10262,7 +10266,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lc_r $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10266 "configure"
|
||||
#line 10270 "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
|
||||
@ -10273,7 +10277,7 @@ int main() {
|
||||
pthread_create()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10281: \"$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
|
||||
@ -10297,17 +10301,17 @@ else
|
||||
|
||||
ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
|
||||
echo "configure:10301: checking for sys/prctl.h" >&5
|
||||
echo "configure:10305: checking for sys/prctl.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 10306 "configure"
|
||||
#line 10310 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/prctl.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:10311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:10315: \"$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*
|
||||
@ -10349,17 +10353,17 @@ if test "$wxUSE_THREADS" = "yes" ; then
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:10353: checking for $ac_hdr" >&5
|
||||
echo "configure:10357: 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 10358 "configure"
|
||||
#line 10362 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:10363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:10367: \"$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*
|
||||
@ -10387,7 +10391,7 @@ done
|
||||
|
||||
|
||||
echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
|
||||
echo "configure:10391: checking for sched_yield in -l$THREADS_LINK" >&5
|
||||
echo "configure:10395: checking for sched_yield in -l$THREADS_LINK" >&5
|
||||
ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -10395,7 +10399,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-l$THREADS_LINK $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10399 "configure"
|
||||
#line 10403 "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
|
||||
@ -10406,7 +10410,7 @@ int main() {
|
||||
sched_yield()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10414: \"$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
|
||||
@ -10428,7 +10432,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6
|
||||
echo "configure:10432: checking for sched_yield in -l"posix4"" >&5
|
||||
echo "configure:10436: checking for sched_yield in -l"posix4"" >&5
|
||||
ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -10436,7 +10440,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-l"posix4" $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10440 "configure"
|
||||
#line 10444 "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
|
||||
@ -10447,7 +10451,7 @@ int main() {
|
||||
sched_yield()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10455: \"$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
|
||||
@ -10477,7 +10481,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
|
||||
echo "configure:10481: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
|
||||
echo "configure:10485: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
|
||||
ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -10485,7 +10489,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-l$THREADS_LINK $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10489 "configure"
|
||||
#line 10493 "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
|
||||
@ -10496,7 +10500,7 @@ int main() {
|
||||
pthread_attr_getschedpolicy()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10504: \"$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
|
||||
@ -10518,7 +10522,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6
|
||||
echo "configure:10522: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5
|
||||
echo "configure:10526: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5
|
||||
ac_lib_var=`echo "posix4"'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -10526,7 +10530,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-l"posix4" $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10530 "configure"
|
||||
#line 10534 "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
|
||||
@ -10537,7 +10541,7 @@ int main() {
|
||||
pthread_attr_getschedpolicy()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10545: \"$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
|
||||
@ -10567,7 +10571,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
|
||||
echo "configure:10571: checking for pthread_cancel in -l$THREADS_LINK" >&5
|
||||
echo "configure:10575: checking for pthread_cancel in -l$THREADS_LINK" >&5
|
||||
ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -10575,7 +10579,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-l$THREADS_LINK $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10579 "configure"
|
||||
#line 10583 "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
|
||||
@ -10586,7 +10590,7 @@ int main() {
|
||||
pthread_cancel()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10594: \"$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
|
||||
@ -10612,13 +10616,13 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
|
||||
echo "configure:10616: checking for pthread_cleanup_push/pop" >&5
|
||||
echo "configure:10620: checking for pthread_cleanup_push/pop" >&5
|
||||
if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10622 "configure"
|
||||
#line 10626 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <pthread.h>
|
||||
int main() {
|
||||
@ -10628,7 +10632,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
|
||||
wx_cv_func_pthread_cleanup_push=yes
|
||||
@ -10795,17 +10799,17 @@ fi
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
|
||||
echo "configure:10799: checking for GL/gl.h" >&5
|
||||
echo "configure:10803: checking for GL/gl.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 10804 "configure"
|
||||
#line 10808 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <GL/gl.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:10809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:10813: \"$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*
|
||||
@ -10823,7 +10827,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
|
||||
echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6
|
||||
echo "configure:10827: checking for glInitNames in -lGL" >&5
|
||||
echo "configure:10831: checking for glInitNames in -lGL" >&5
|
||||
ac_lib_var=`echo GL'_'glInitNames | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -10831,7 +10835,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lGL wxUSE_OPENGL=0 $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10835 "configure"
|
||||
#line 10839 "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
|
||||
@ -10842,7 +10846,7 @@ int main() {
|
||||
glInitNames()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10850: \"$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
|
||||
@ -10869,7 +10873,7 @@ else
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for glInitNames in -lMesaGL""... $ac_c" 1>&6
|
||||
echo "configure:10873: checking for glInitNames in -lMesaGL" >&5
|
||||
echo "configure:10877: checking for glInitNames in -lMesaGL" >&5
|
||||
ac_lib_var=`echo MesaGL'_'glInitNames | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -10877,7 +10881,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lMesaGL $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10881 "configure"
|
||||
#line 10885 "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
|
||||
@ -10888,7 +10892,7 @@ int main() {
|
||||
glInitNames()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10896: \"$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
|
||||
@ -11104,16 +11108,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
|
||||
cross_compiling=$ac_cv_prog_cxx_cross
|
||||
|
||||
echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6
|
||||
echo "configure:11108: checking the type of the third argument of getsockname" >&5
|
||||
echo "configure:11112: checking the type of the third argument of getsockname" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11110 "configure"
|
||||
#line 11114 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/socket.h>
|
||||
int main() {
|
||||
socklen_t len; getsockname(0, NULL, &len);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define SOCKLEN_T socklen_t
|
||||
@ -11124,14 +11128,14 @@ else
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11128 "configure"
|
||||
#line 11132 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/socket.h>
|
||||
int main() {
|
||||
size_t len; getsockname(0, NULL, &len);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define SOCKLEN_T size_t
|
||||
@ -11142,14 +11146,14 @@ else
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11146 "configure"
|
||||
#line 11150 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/socket.h>
|
||||
int main() {
|
||||
int len; getsockname(0, NULL, &len);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define SOCKLEN_T int
|
||||
@ -11184,17 +11188,17 @@ if test "$wxUSE_JOYSTICK" = 1; then
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:11188: checking for $ac_hdr" >&5
|
||||
echo "configure:11192: 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 11193 "configure"
|
||||
#line 11197 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:11198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:11202: \"$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*
|
||||
@ -11236,12 +11240,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
|
||||
for ac_func in dlopen
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:11240: checking for $ac_func" >&5
|
||||
echo "configure:11244: 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 11245 "configure"
|
||||
#line 11249 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -11264,7 +11268,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11272: \"$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
|
||||
@ -11292,7 +11296,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:11296: checking for dlopen in -ldl" >&5
|
||||
echo "configure:11300: 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
|
||||
@ -11300,7 +11304,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11304 "configure"
|
||||
#line 11308 "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
|
||||
@ -11311,7 +11315,7 @@ int main() {
|
||||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11319: \"$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
|
||||
@ -11340,12 +11344,12 @@ else
|
||||
for ac_func in shl_load
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:11344: checking for $ac_func" >&5
|
||||
echo "configure:11348: 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 11349 "configure"
|
||||
#line 11353 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -11368,7 +11372,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11376: \"$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
|
||||
@ -11451,12 +11455,15 @@ fi
|
||||
|
||||
IODBC_C_SRC=""
|
||||
if test "$wxUSE_ODBC" = "yes" ; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define wxUSE_ODBC 1
|
||||
EOF
|
||||
|
||||
WXODBCFLAG="-D_IODBC_"
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
|
||||
WXODBCFLAG="-D_IODBC_"
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
|
||||
IODBCOBJS="\$(IODBC_OBJS)"
|
||||
else
|
||||
IODBCOBJS=
|
||||
fi
|
||||
|
||||
|
||||
@ -12011,10 +12018,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 "configure:12018: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo "configure:12026: 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
|
||||
@ -12311,6 +12319,7 @@ s%@GENERICOBJS@%$GENERICOBJS%g
|
||||
s%@GUIDEPS@%$GUIDEPS%g
|
||||
s%@COMMONDEPS@%$COMMONDEPS%g
|
||||
s%@GENERICDEPS@%$GENERICDEPS%g
|
||||
s%@IODBCOBJS@%$IODBCOBJS%g
|
||||
s%@UNIXOBJS@%$UNIXOBJS%g
|
||||
s%@UNIXDEPS@%$UNIXDEPS%g
|
||||
s%@ALL_OBJECTS@%$ALL_OBJECTS%g
|
||||
|
||||
17
configure.in
17
configure.in
@ -1679,7 +1679,7 @@ dnl the name of the (libtool) library
|
||||
WX_LIBRARY="wx_${TOOLKIT_DIR}"
|
||||
|
||||
dnl the sources, their dependenices and the headers
|
||||
ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(JPEGOBJS) \$(PNGOBJS) \$(ZLIBOBJS)"
|
||||
ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(JPEGOBJS) \$(PNGOBJS) \$(ZLIBOBJS) \$(IODBCOBJS)"
|
||||
ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)"
|
||||
ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)"
|
||||
else
|
||||
@ -1945,6 +1945,8 @@ AC_CACHE_CHECK([for vsscanf], wx_cv_func_vsscanf,
|
||||
|
||||
AC_LANG_RESTORE
|
||||
|
||||
if test "$USE_UNIX" = 1; then
|
||||
|
||||
dnl check for vfork() (even if it's the same as fork() in modern Unices)
|
||||
AC_CHECK_FUNCS(vfork)
|
||||
|
||||
@ -1971,6 +1973,9 @@ AC_CHECK_FUNCS(inet_addr)
|
||||
AC_CHECK_FUNCS(inet_aton)
|
||||
AC_CHECK_LIB(resolv, inet_aton)
|
||||
|
||||
fi
|
||||
dnl Unix
|
||||
|
||||
dnl ===========================================================================
|
||||
dnl Now we have all the info we need - use it!
|
||||
dnl ===========================================================================
|
||||
@ -2459,9 +2464,12 @@ dnl ----------------------------------------------------------------
|
||||
|
||||
IODBC_C_SRC=""
|
||||
if test "$wxUSE_ODBC" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_ODBC)
|
||||
WXODBCFLAG="-D_IODBC_"
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
|
||||
AC_DEFINE(wxUSE_ODBC)
|
||||
WXODBCFLAG="-D_IODBC_"
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
|
||||
IODBCOBJS="\$(IODBC_OBJS)"
|
||||
else
|
||||
IODBCOBJS=
|
||||
fi
|
||||
|
||||
dnl ----------------------------------------------------------------
|
||||
@ -2879,6 +2887,7 @@ AC_SUBST(GENERICOBJS)
|
||||
AC_SUBST(GUIDEPS)
|
||||
AC_SUBST(COMMONDEPS)
|
||||
AC_SUBST(GENERICDEPS)
|
||||
AC_SUBST(IODBCOBJS)
|
||||
AC_SUBST(UNIXOBJS)
|
||||
AC_SUBST(UNIXDEPS)
|
||||
AC_SUBST(ALL_OBJECTS)
|
||||
|
||||
@ -489,7 +489,7 @@ JPEGOBJS = \
|
||||
jquant2.o \
|
||||
jdmerge.o
|
||||
|
||||
IODBCOBJS = \
|
||||
IODBC_OBJS = \
|
||||
catalog.o \
|
||||
connect.o \
|
||||
dlf.o \
|
||||
@ -515,8 +515,9 @@ GENERICOBJS = @GENERICOBJS@
|
||||
GENERICDEPS = @GENERICDEPS@
|
||||
UNIXOBJS = @UNIXOBJS@
|
||||
UNIXDEPS = @UNIXDEPS@
|
||||
IODBCOBJS = @IODBCOBJS@
|
||||
|
||||
OBJECTS = @ALL_OBJECTS@ $(IODBCOBJS)
|
||||
OBJECTS = @ALL_OBJECTS@
|
||||
|
||||
DEPFILES = @ALL_DEPFILES@
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user