build ODBC objects in wxBase build as well if --with-odbc was specified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
beab25bde3
commit
e45387bf10
10
configure.in
10
configure.in
@ -2074,10 +2074,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
|
||||
ALL_OBJECTS="${ALL_OBJECTS} \$(HTMLOBJS)"
|
||||
fi
|
||||
|
||||
dnl ODBC objects are Unix only
|
||||
if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
|
||||
ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
|
||||
fi
|
||||
if test "$wxUSE_LIBJPEG" = "builtin" ; then
|
||||
ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"
|
||||
fi
|
||||
@ -2124,6 +2120,12 @@ fi
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Optional libraries included when system library is not used
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
dnl ODBC objects are Unix only
|
||||
if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
|
||||
ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_REGEX" = "builtin" ; then
|
||||
ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user