svn commit: r1920357 - in /apr/apr-util/branches/1.7.x: CMakeLists.txt include/apr_ldap.hwc include/apu.hwc

Author: ivan
Date: Sun Sep  1 16:10:10 2024
New Revision: 1920357

URL: http://svn.apache.org/viewvc?rev=1920357&view=rev
Log:
CMake: Use #cmakedefine01 where it makes sense.

* CMakeLists.txt: Do not set apu_have_crypto_10 and apr_has_ldap_10.

* include/apr_ldap.hwc: Use #cmakedefine01 for APR_HAS_LDAP.

* include/apu.hwc: Use #cmakedefine01 for APU_HAVE_CRYPTO.

Modified:
    apr/apr-util/branches/1.7.x/CMakeLists.txt
    apr/apr-util/branches/1.7.x/include/apr_ldap.hwc
    apr/apr-util/branches/1.7.x/include/apu.hwc

Modified: apr/apr-util/branches/1.7.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/CMakeLists.txt?rev=1920357&r1=1920356&r2=1920357&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/CMakeLists.txt (original)
+++ apr/apr-util/branches/1.7.x/CMakeLists.txt Sun Sep  1 16:10:10 2024
@@ -74,26 +74,16 @@ ENDIF()
 
 # create 1-or-0 representation of feature tests for apu.h
 
-SET(apu_have_crypto_10 0)
 SET(apu_have_apr_iconv_10 0) # not yet implemented
-SET(apr_has_ldap_10 0)
 SET(apu_use_libxml2_10 0)
 SET(apu_use_expat_10 0)
 
-IF(APU_HAVE_CRYPTO)
-  SET(apu_have_crypto_10 1)
-ENDIF()
-
 IF(APU_USE_EXPAT)
   SET(apu_use_expat_10 1)
 ELSE()
   SET(apu_use_libxml2_10 1)
 ENDIF()
 
-IF(APR_HAS_LDAP)
-  SET(apr_has_ldap_10 1)
-ENDIF()
-
 SET(LDAP_LIBRARIES)
 IF(APR_HAS_LDAP)
   SET(LDAP_LIBRARIES wldap32)

Modified: apr/apr-util/branches/1.7.x/include/apr_ldap.hwc
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/include/apr_ldap.hwc?rev=1920357&r1=1920356&r2=1920357&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/include/apr_ldap.hwc (original)
+++ apr/apr-util/branches/1.7.x/include/apr_ldap.hwc Sun Sep  1 16:10:10 2024
@@ -31,7 +31,7 @@
  */
 
 /* this will be defined if LDAP support was compiled into apr-util */
-#define APR_HAS_LDAP		    @apr_has_ldap_10@
+#cmakedefine01 APR_HAS_LDAP
 
 /* identify the LDAP toolkit used */
 #define APR_HAS_NETSCAPE_LDAPSDK    0

Modified: apr/apr-util/branches/1.7.x/include/apu.hwc
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/include/apu.hwc?rev=1920357&r1=1920356&r2=1920357&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/include/apu.hwc (original)
+++ apr/apr-util/branches/1.7.x/include/apu.hwc Sun Sep  1 16:10:10 2024
@@ -130,7 +130,7 @@
 #define APU_HAVE_ODBC           1
 #endif
 
-#define APU_HAVE_CRYPTO         @apu_have_crypto_10@
+#cmakedefine01 APU_HAVE_CRYPTO
 
 #ifndef APU_DSO_MODULE_BUILD
 #define APU_HAVE_OPENSSL        0