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

1. configure now checks first for timezone, then _timezone and

Browse Source 
then __timezone, so that we don't use glibc's internal variable whenever possible
2. added wxUSE_OLE so that MSW compiles with Mingw32


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-07-08 22:52:59 +00:00
parent f6045f99ba
commit 4f11a3437b
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@@ -15521,14 +15521,14 @@ else
int main() {
int tz;
tz = __timezone;
tz = timezone;
; return 0; }
EOF
if { (eval echo configure:15529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_var_timezone=__timezone
wx_cv_var_timezone=timezone
else
echo "configure: failed program was:" >&5
@@ -15567,14 +15567,14 @@ else
int main() {
int tz;
tz = timezone;
tz = __timezone;
; return 0; }
EOF
if { (eval echo configure:15575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_var_timezone=timezone
wx_cv_var_timezone=__timezone
else
echo "configure: failed program was:" >&5
@@ -16731,6 +16731,10 @@ done
ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
LIBS="$LIBS -lole32 -luuid"
cat >> confdefs.h <<\EOF
#define wxUSE_OLE 1
EOF
if test "$wxUSE_METAFILE" = "yes"; then
cat >> confdefs.h <<\EOF

9
configure.in
View File

@@ -3484,10 +3484,10 @@ if test "$wxUSE_DATETIME" = "yes"; then
],
[
int tz;
tz = __timezone;
tz = timezone;
],
[
wx_cv_var_timezone=__timezone
wx_cv_var_timezone=timezone
],
[
AC_TRY_COMPILE(
@@ -3508,10 +3508,10 @@ if test "$wxUSE_DATETIME" = "yes"; then
],
[
int tz;
tz = timezone;
tz = __timezone;
],
[
wx_cv_var_timezone=timezone
wx_cv_var_timezone=__timezone
],
AC_MSG_ERROR(no timezone variable)
)
@@ -3942,6 +3942,7 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
LIBS="$LIBS -lole32 -luuid"
AC_DEFINE(wxUSE_OLE)
dnl metafiles need the ole code, right?? if not this
dnl doesn't need to be in here.