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

Author: ivan
Date: Sun Apr 13 17:29:13 2025
New Revision: 1925068

URL: http://svn.apache.org/viewvc?rev=1925068&view=rev
Log:
On 1.7.x: Follow-up to r1925067: Correctly resolve conflicts.

Modified:
    apr/apr-util/branches/1.7.x/CMakeLists.txt
    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=1925068&r1=1925067&r2=1925068&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/CMakeLists.txt (original)
+++ apr/apr-util/branches/1.7.x/CMakeLists.txt Sun Apr 13 17:29:13 2025
@@ -70,6 +70,7 @@ ENDIF()
 
 IF(APU_HAVE_CRYPTO)
   FIND_PACKAGE(OpenSSL REQUIRED)
+  SET(APU_HAVE_OPENSSL ON)
 ENDIF()
 
 IF(APU_HAVE_ICONV)
@@ -78,7 +79,6 @@ ENDIF()
 
 IF(APU_HAVE_SQLITE3)
   FIND_PACKAGE(SQLite3 REQUIRED)
-  SET(APU_HAVE_OPENSSL ON)
 endif()
 
 IF(APU_HAVE_PGSQL)

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=1925068&r1=1925067&r2=1925068&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/include/apu.hwc (original)
+++ apr/apr-util/branches/1.7.x/include/apu.hwc Sun Apr 13 17:29:13 2025
@@ -134,9 +134,9 @@
 #cmakedefine01 APU_HAVE_SQLITE3
 #cmakedefine01 APU_HAVE_PGSQ
 #cmakedefine01 APU_HAVE_CRYPTO
+#cmakedefine01 APU_HAVE_OPENSSL
 
 #ifndef APU_DSO_MODULE_BUILD
-#define APU_HAVE_OPENSSL        0
 #define APU_HAVE_NSS            0
 #endif