Author: tschoening
Date: Fri Feb 14 11:44:29 2014
New Revision: 1568250
URL: http://svn.apache.org/r1568250
Log:
ODBC is enabled by default in apu.h and therefore the default of with-ODBC
should be using it on Windows unless explicitly deactivated for some reason.
Modified:
incubator/log4cxx/trunk/build.xml
Modified: incubator/log4cxx/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/build.xml?rev=1568250&r1=1568249&r2=1568250&view=diff
==============================================================================
--- incubator/log4cxx/trunk/build.xml (original)
+++ incubator/log4cxx/trunk/build.xml Fri Feb 14 11:44:29 2014
@@ -238,7 +238,7 @@
-Dwith-apr=APRPATH
-Dwith-apr-util=PATH
-Dwith-SMTP=[libesmtp, no] (default no)
- -Dwith-ODBC=[unixODBC, iODBC, Microsoft, no] (default
no)
+ -Dwith-ODBC=[unixODBC, iODBC, Microsoft, no]
(default=no on Unix, Microsoft on Windows)
</echo>
</target>
@@ -280,9 +280,14 @@
<condition property="odbc.lib"
value="odbc32">
- <equals arg1="${with-ODBC}"
- arg2="Microsoft"
- />
+ <and>
+ <not>
+ <equals arg1="${with-ODBC}"
+ arg2="no"
+ />
+ </not>
+ <isset property="is-windows" />
+ </and>
</condition>
<condition property="has-ODBC"
