svn commit: r1920407 - in /apr/apr-util/branches/1.7.x: CMakeLists.txt include/private/apu_config.hwc

Author: ivan
Date: Mon Sep  2 18:04:40 2024
New Revision: 1920407

URL: http://svn.apache.org/viewvc?rev=1920407&view=rev
Log:
CMake: Define HAVE_SQL_H in apu_config.hwc.

Added:
    apr/apr-util/branches/1.7.x/include/private/apu_config.hwc
Modified:
    apr/apr-util/branches/1.7.x/CMakeLists.txt

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=1920407&r1=1920406&r2=1920407&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/CMakeLists.txt (original)
+++ apr/apr-util/branches/1.7.x/CMakeLists.txt Mon Sep  2 18:04:40 2024
@@ -101,10 +101,8 @@ CONFIGURE_FILE(include/apu.hwc
               ${PROJECT_BINARY_DIR}/apu.h)
 CONFIGURE_FILE(include/apr_ldap.hwc
               ${PROJECT_BINARY_DIR}/apr_ldap.h)
-# "COPYONLY" just because anything else isn't implemented ;)
-CONFIGURE_FILE(include/private/apu_config.hw
-               ${PROJECT_BINARY_DIR}/apu_config.h
-               COPYONLY)
+CONFIGURE_FILE(include/private/apu_config.hwc
+               ${PROJECT_BINARY_DIR}/apu_config.h)
 CONFIGURE_FILE(include/private/apu_select_dbm.hw
                ${PROJECT_BINARY_DIR}/apu_select_dbm.h
                COPYONLY)
@@ -351,7 +349,7 @@ IF(APU_DSO_MODULE_BUILD AND APU_HAVE_ODB
   TARGET_LINK_LIBRARIES(apr_dbd_odbc-1
                         PRIVATE libaprutil-1 apr::libapr-1 odbc32 odbccp32)
   SET_PROPERTY(TARGET apr_dbd_odbc-1 APPEND PROPERTY LINK_FLAGS /export:apr_dbd_odbc_driver)
-  SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DSO_MODULE_BUILD=${apu_dso_module_build_10}")
+  SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;APU_DSO_MODULE_BUILD=${apu_dso_module_build_10}")
   TARGET_COMPILE_DEFINITIONS(apr_dbd_odbc-1
                              PRIVATE "DLL_NAME=apr_dbd_odbc")
 ENDIF()

Added: apr/apr-util/branches/1.7.x/include/private/apu_config.hwc
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/include/private/apu_config.hwc?rev=1920407&view=auto
==============================================================================
--- apr/apr-util/branches/1.7.x/include/private/apu_config.hwc (added)
+++ apr/apr-util/branches/1.7.x/include/private/apu_config.hwc Mon Sep  2 18:04:40 2024
@@ -0,0 +1,55 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* 
+ * Note: This is a Windows specific version of apu_config.hw. It is copied
+ * as apu_config.h at the start of a Windows build.
+ */
+
+#ifdef WIN32
+
+#ifndef APU_CONFIG_H
+#define APU_CONFIG_H
+
+/* Compile win32 with DSO support for .dll builds */
+#ifdef APU_DECLARE_STATIC
+#define APU_DSO_BUILD           0
+#else
+#define APU_DSO_BUILD           1
+#endif
+
+/* Presume a standard, modern (5.x) mysql sdk/
+#define HAVE_MY_GLOBAL_H        1
+
+/* Assume that sql.h is always available on Windows */
+#define HAVE_SQL_H              1
+
+/* my_sys.h is broken on VC/Win32, and apparently not required */
+/* #undef HAVE_MY_SYS_H           0 */
+
+/*
+ * Windows does not have GDBM, and we always use the bundled (new) Expat
+ */
+
+/* Define if you have the gdbm library (-lgdbm).  */
+/* #undef HAVE_LIBGDBM */
+
+/* define if Expat 1.0 or 1.1 was found */
+/* #undef APR_HAVE_OLD_EXPAT */
+
+
+#endif /* APU_CONFIG_H */
+#endif /* WIN32 */