diff options
| author | mturk <mturk@13f79535-47bb-0310-9956-ffa450edef68> | 2021-12-03 03:52:49 +0000 |
|---|---|---|
| committer | mturk <mturk@13f79535-47bb-0310-9956-ffa450edef68> | 2021-12-03 03:52:49 +0000 |
| commit | f531e1b771d30415ad29942c394625766e75b13f (patch) | |
| tree | ddea504bca0a395fffdc4511801b46298fca759b | |
| parent | 1cbda52138a70acfdd83e6d0344ea5bba4e4edbb (diff) | |
| download | libapr-f531e1b771d30415ad29942c394625766e75b13f.tar.gz | |
Use standard configure options for dbd ODBC
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1895523 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | include/apr.hwc | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3eff1f436..e8b86fb80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/include/apr.hwc b/include/apr.hwc index 6199deab3..f8a948d62 100644 --- a/include/apr.hwc +++ b/include/apr.hwc @@ -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) |