From: Václav Slavík <vslavik@fastmail.fm>
Date: Thu, 22 Jan 2004 09:01:33 +0000 (+0000)
Subject: let <wx-lib>odbc</wx-lib> do nothing if USE_ODBC=0
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/395a1c56f945a46cd2b1bc2031dea5e0a3801af1

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 3e633ad293..4be742cddb 100644
--- 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>