--- support-files/CMakeLists.txt.orig	2020-09-23 12:37:48 UTC
+++ support-files/CMakeLists.txt
@@ -24,8 +24,9 @@ IF(NOT UNIX)
   RETURN()
 ENDIF()
 
-INSTALL(FILES mysql.m4
-  DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
+IF(NOT WITHOUT_CLIENTLIBS)
+  INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
+ENDIF(NOT WITHOUT_CLIENTLIBS)
 
 SET(localstatedir "${MYSQL_DATADIR}")
 
@@ -43,7 +44,7 @@ ENDIF()
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql-log-rotate.in
   ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate @ONLY)
 
-IF(NOT WITH_SYSTEMD)
+IF(NOT WITHOUT_SERVER)
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.server.sh
     ${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY
   )
@@ -59,6 +60,7 @@ IF(NOT WITH_SYSTEMD)
   )
 ENDIF()
 
+IF(NOT WITHOUT_SERVER)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate
   COMPONENT Server_Scripts
   DESTINATION ${INSTALL_SUPPORTFILESDIR}
@@ -66,6 +68,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-ro
   OWNER_READ OWNER_WRITE
   GROUP_READ WORLD_READ
   )
+ENDIF()
 
 IF(WITH_ROUTER)
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysqlrouter-log-rotate.in