You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mt...@apache.org on 2021/12/03 03:52:49 UTC
svn commit: r1895523 - in /apr/apr/trunk: CMakeLists.txt include/apr.hwc
Author: mturk
Date: Fri Dec 3 03:52:49 2021
New Revision: 1895523
URL: http://svn.apache.org/viewvc?rev=1895523&view=rev
Log:
Use standard configure options for dbd ODBC
Modified:
apr/apr/trunk/CMakeLists.txt
apr/apr/trunk/include/apr.hwc
Modified: apr/apr/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CMakeLists.txt?rev=1895523&r1=1895522&r2=1895523&view=diff
==============================================================================
--- apr/apr/trunk/CMakeLists.txt (original)
+++ apr/apr/trunk/CMakeLists.txt Fri Dec 3 03:52:49 2021
@@ -91,6 +91,7 @@ SET(apu_use_libxml2_10 0)
SET(apu_use_expat_10 0)
SET(apu_use_xmllite_10 0)
SET(apu_have_iconv_10 0)
+SET(apu_have_odbc_10 0)
IF(APR_HAVE_IPV6)
SET(apr_have_ipv6_10 1)
@@ -111,6 +112,9 @@ ENDIF()
IF(APU_HAVE_ICONV)
SET(apu_have_iconv_10 1)
ENDIF()
+IF(APU_HAVE_ODBC)
+SET(apu_have_odbc_10 1)
+ENDIF()
CONFIGURE_FILE(include/apr.hwc
${PROJECT_BINARY_DIR}/apr.h)
@@ -507,7 +511,6 @@ IF(APU_HAVE_ODBC)
LIST(APPEND dbd_drivers odbc)
TARGET_LINK_LIBRARIES(apr_dbd_odbc-2 ${apr_libname} ${APR_SYSTEM_LIBS} odbc32 odbccp32)
SET_PROPERTY(TARGET apr_dbd_odbc-2 APPEND PROPERTY LINK_FLAGS /export:apr_dbd_odbc_driver)
- SET_TARGET_PROPERTIES(apr_dbd_odbc-2 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DSO_MODULE_BUILD")
SET_TARGET_PROPERTIES(apr_dbd_odbc-2 PROPERTIES COMPILE_FLAGS "-DDLL_NAME=apr_dbd_odbc-2")
ENDIF()
Modified: apr/apr/trunk/include/apr.hwc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hwc?rev=1895523&r1=1895522&r2=1895523&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hwc (original)
+++ apr/apr/trunk/include/apr.hwc Fri Dec 3 03:52:49 2021
@@ -655,22 +655,18 @@ typedef int apr_wait_t;
* are supported. The driver builds enable
* these flags individually.
*/
-#ifndef APU_DSO_MODULE_BUILD
#define APU_HAVE_PGSQL 0
#define APU_HAVE_MYSQL 0
#define APU_HAVE_SQLITE3 0
#define APU_HAVE_SQLITE2 0
#define APU_HAVE_ORACLE 0
-#define APU_HAVE_ODBC 0
-#endif
+#define APU_HAVE_ODBC @apu_have_odbc_10@
#define APU_HAVE_CRYPTO @apu_have_crypto_10@
-
-#ifndef APU_DSO_MODULE_BUILD
-#define APU_HAVE_OPENSSL 0
+#define APU_HAVE_CRYPTO_PRNG 0
#define APU_HAVE_NSS 0
#define APU_HAVE_COMMONCRYPTO 0
-#endif
+#define APU_HAVE_OPENSSL @apu_have_crypto_10@
#define APU_HAVE_ICONV @apu_have_iconv_10@
#define APR_HAS_XLATE (APU_HAVE_ICONV)