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

   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

diff --git a/configure b/configure
index 16cdb7dfa388407fe1fafed0f4a4f693d66c9b29..df82ea7f884cd5ad570a1b01e6a8c98cb6f74528 100755 (executable)
--- a/configure
+++ b/configure
@@ -15521,14 +15521,14 @@ else
 int main() {
 
                                 int tz;
 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*
   
                             
 ; 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
                             
 else
   echo "configure: failed program was:" >&5


@@ -15567,14 +15567,14 @@ else
 int main() {
 
                                                 int tz;
 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*
   
                                             
 ; 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
                                             
 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"
                 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
 
                                                 if test "$wxUSE_METAFILE" = "yes"; then
                     cat >> confdefs.h <<\EOF

diff --git a/configure.in b/configure.in
index 233e04b7bd2655358cecee4dc8024e0b0c45607a..012c1c6ae4135e087430564e2d809155e6420d8f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3484,10 +3484,10 @@ if test "$wxUSE_DATETIME" = "yes"; then
                             ],
                             [
                                 int tz;
                             ],
                             [
                                 int tz;

-                                tz = __timezone;
+                                tz = timezone;

                             ],
                             [
                             ],
                             [

-                                wx_cv_var_timezone=__timezone
+                                wx_cv_var_timezone=timezone

                             ],
                             [
                                 AC_TRY_COMPILE(
                             ],
                             [
                                 AC_TRY_COMPILE(


@@ -3508,10 +3508,10 @@ if test "$wxUSE_DATETIME" = "yes"; then
                                             ],
                                             [
                                                 int tz;
                                             ],
                                             [
                                                 int tz;

-                                                tz = timezone;
+                                                tz = __timezone;

                                             ],
                                             [
                                             ],
                                             [

-                                                wx_cv_var_timezone=timezone
+                                                wx_cv_var_timezone=__timezone

                                             ],
                                             AC_MSG_ERROR(no timezone variable)
                                         )
                                             ],
                                             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"
                 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.
 
                 dnl metafiles need the ole code, right??  if not this
                 dnl doesn't need to be in here.