let <wx-lib>odbc</wx-lib> do nothing if USE_ODBC=0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 3e633ad293452e75deda32395e7c81ba65026872..4be742cddb58ab6d01659dec7c1ec9e3c5c0bf40 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -134,7 +134,9 @@
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xml')))</if>
     </set>
     <set var="WXLIB_ODBC">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('odbc')))</if>
+        <if cond="MONOLITHIC=='0' and USE_ODBC=='1'">
+            $(mk.evalExpr(wxwin.mkLibName('odbc')))
+        </if>
     </set>
     <set var="WXLIB_DBGRID">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if>