AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1. don't compile IODBC sources for MSW

Browse Source 
2. check for gettimeofday/ftime in configure (even though we have localtime)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-02-02 18:00:30 +00:00
parent 68df5777c7
commit 3fcdd07b5d
2 changed files with 346 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

597
configure vendored
View File

File diff suppressed because it is too large Load Diff

21
configure.in
View File

@ -1752,7 +1752,13 @@ fi
WX_LIBRARY="wx_${TOOLKIT_DIR}"
dnl the sources, their dependenices and the headers
ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(IODBCOBJS)"
ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS)"
dnl ODBC objects are Unix only
if test "$(TOOLKIT)" != "MSW"; then
ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
fi
if test "$wxUSE_LIBJPEG" = "yes" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"
fi
@ -2609,9 +2615,8 @@ if test "$wxUSE_TIMEDATE" = "yes"; then
dnl as we want $wx_cv_var_timezone to be expanded, use AC_DEFINE_UNQUOTED
AC_DEFINE_UNQUOTED(WX_TIMEZONE, $wx_cv_var_timezone)
dnl check for localtime (POSIX), gettimeofday (SVr4, BSD 4.3) and ftime
dnl (V7, BSD 4.3)
AC_CHECK_FUNCS(localtime gettimeofday ftime, break)
dnl check for localtime (it's POSIX, but the check can do no harm...)
AC_CHECK_FUNCS(localtime)
if test "$ac_cv_func_localtime" = "yes"; then
AC_CACHE_CHECK(for tm_gmtoff in struct tm,
@ -2632,7 +2637,13 @@ if test "$wxUSE_TIMEDATE" = "yes"; then
wx_cv_struct_tm_has_gmtoff=no
)
])
elif test "$ac_cv_func_gettimeofday" = "yes"; then
fi
dnl check for gettimeofday (SVr4, BSD 4.3) and ftime (V7, BSD 4.3) for the
dnl function to be used for high resolution timers
AC_CHECK_FUNCS(gettimeofday ftime, break)
if test "$ac_cv_func_gettimeofday" = "yes"; then
AC_CACHE_CHECK([whether gettimeofday takes two arguments],
wx_cv_func_gettimeofday_has_2_args,
[