You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by iv...@apache.org on 2024/07/22 21:38:47 UTC
svn commit: r1919459 - in /apr/apr/trunk: CMakeLists.txt include/apr.hwc
Author: ivan
Date: Mon Jul 22 21:38:47 2024
New Revision: 1919459
URL: http://svn.apache.org/viewvc?rev=1919459&view=rev
Log:
CMake: Use #cmakedefine01 in include/apr.hwc.
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=1919459&r1=1919458&r2=1919459&view=diff
==============================================================================
--- apr/apr/trunk/CMakeLists.txt (original)
+++ apr/apr/trunk/CMakeLists.txt Mon Jul 22 21:38:47 2024
@@ -122,29 +122,11 @@ ENDIF()
# create 1-or-0 representation of feature tests for apr.h
-SET(apr_have_ipv6_10 0)
-SET(apu_have_crypto_10 0)
-SET(apu_have_ldap_10 0)
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)
-SET(apu_have_sqlite3_10 0)
SET(apr_have_modular_dso_10 0)
-IF(APR_HAVE_IPV6)
- SET(apr_have_ipv6_10 1)
-ENDIF()
-
-IF(APU_HAVE_CRYPTO)
- SET(apu_have_crypto_10 1)
-ENDIF()
-
-IF(APU_HAVE_LDAP)
- SET(apu_have_ldap_10 1)
-ENDIF()
-
IF(APU_USE_EXPAT)
SET(apu_use_expat_10 1)
ELSEIF(APU_USE_LIBXML2)
@@ -153,16 +135,6 @@ ELSE(APU_USE_XMLLITE)
SET(apu_use_xmllite_10 1)
ENDIF()
-IF(APU_HAVE_ICONV)
- SET(apu_have_iconv_10 1)
-ENDIF()
-IF(APU_HAVE_ODBC)
- SET(apu_have_odbc_10 1)
-ENDIF()
-IF(APU_HAVE_SQLITE3)
- SET(apu_have_sqlite3_10 1)
-ENDIF()
-
IF(APR_MODULAR_DSO)
SET(apr_have_modular_dso_10 1)
ENDIF()
Modified: apr/apr/trunk/include/apr.hwc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hwc?rev=1919459&r1=1919458&r2=1919459&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hwc (original)
+++ apr/apr/trunk/include/apr.hwc Mon Jul 22 21:38:47 2024
@@ -296,7 +296,7 @@ extern "C" {
#define APR_HAVE_IN_ADDR 1
#define APR_HAVE_INET_ADDR 1
#define APR_HAVE_INET_NETWORK 0
-#define APR_HAVE_IPV6 @apr_have_ipv6_10@
+#cmakedefine01 APR_HAVE_IPV6
#define APR_HAVE_SOCKADDR_UN 0
#define APR_HAVE_MEMMEM 0
#define APR_HAVE_MEMMOVE 1
@@ -652,25 +652,25 @@ typedef int apr_wait_t;
*/
#define APU_HAVE_PGSQL 0
#define APU_HAVE_MYSQL 0
-#define APU_HAVE_SQLITE3 @apu_have_sqlite3_10@
+#cmakedefine01 APU_HAVE_SQLITE3
#define APU_HAVE_SQLITE2 0
#define APU_HAVE_ORACLE 0
-#define APU_HAVE_ODBC @apu_have_odbc_10@
+#cmakedefine01 APU_HAVE_ODBC
-#define APU_HAVE_CRYPTO @apu_have_crypto_10@
+#cmakedefine01 APU_HAVE_CRYPTO
#define APU_HAVE_CRYPTO_PRNG 0
#define APU_HAVE_NSS 0
#define APU_HAVE_COMMONCRYPTO 0
-#define APU_HAVE_OPENSSL @apu_have_crypto_10@
+#cmakedefine01 APU_HAVE_OPENSSL
-#define APR_HAS_LDAP @apu_have_ldap_10@
+#cmakedefine01 APR_HAS_LDAP
#define APR_HAS_OPENLDAP_LDAPSDK 0
#define APR_HAS_MICROSOFT_LDAPSDK 1
#define APR_HAS_TIVOLI_LDAPSDK 0
#define APR_HAS_ZOS_LDAPSDK 0
#define APR_HAS_OTHER_LDAPSDK 0
-#define APU_HAVE_ICONV @apu_have_iconv_10@
+#cmakedefine01 APU_HAVE_ICONV
#define APR_HAS_XLATE (APU_HAVE_ICONV)
#define APU_USE_EXPAT @apu_use_expat_10@