You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by pe...@apache.org on 2017/08/03 17:38:22 UTC

svn commit: r1804024 - in /tcl/rivet/branches/cmake: ChangeLog cmake/CMakeLists.txt cmake/cmake_extra_modules/checks.cmake cmake/cmake_extra_modules/rivet_config.h.cmake

Author: petasis
Date: Thu Aug  3 17:38:22 2017
New Revision: 1804024

URL: http://svn.apache.org/viewvc?rev=1804024&view=rev
Log:
CMake: More checks for rivet_config.h

Modified:
    tcl/rivet/branches/cmake/ChangeLog
    tcl/rivet/branches/cmake/cmake/CMakeLists.txt
    tcl/rivet/branches/cmake/cmake/cmake_extra_modules/checks.cmake
    tcl/rivet/branches/cmake/cmake/cmake_extra_modules/rivet_config.h.cmake

Modified: tcl/rivet/branches/cmake/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/cmake/ChangeLog?rev=1804024&r1=1804023&r2=1804024&view=diff
==============================================================================
--- tcl/rivet/branches/cmake/ChangeLog (original)
+++ tcl/rivet/branches/cmake/ChangeLog Thu Aug  3 17:38:22 2017
@@ -1,5 +1,6 @@
 2017-08-03 Georgios Petasis <pe...@apache.org>
-	* CMake build system: Added support for installing Rivet.
+	* CMake build system: Added support for installing Rivet. Added more
+	checks for various definitions in config.h/rivet_config.h.
 
 2017-08-03 Georgios Petasis <pe...@apache.org>
 	* CMake build system: Added missing source files, enabled as default
@@ -11,7 +12,7 @@
 
 2017-08-02 Massimo Manghi <mx...@apache.org>
 	* Changed references in cmake/CMakeList.txt to build with
-	code in src/mod_rivet_ng
+	code in src/mod_rivet_ng.
 
 2017-08-02 Georgios Petasis <pe...@apache.org>
 	* Created a new branch (cmake) for the CMake build system.

Modified: tcl/rivet/branches/cmake/cmake/CMakeLists.txt
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/cmake/cmake/CMakeLists.txt?rev=1804024&r1=1804023&r2=1804024&view=diff
==============================================================================
--- tcl/rivet/branches/cmake/cmake/CMakeLists.txt (original)
+++ tcl/rivet/branches/cmake/cmake/CMakeLists.txt Thu Aug  3 17:38:22 2017
@@ -26,6 +26,7 @@ set(with-tclsh "" CACHE FILEPATH "locati
 set(with-tcl   "" CACHE PATH "directory containing tcl configuration (tclConfig.sh)")
 set(with-post-max 0 CACHE STRING  "BYTES Maximum size of data to be sent with a POST")
 set(with-rivet-core "mod_rivet_ng" CACHE STRING "mod_rivet core directory")
+set(with-upload-dir "/tmp"         CACHE STRING "Default directory for uploads")
 option(version-display            "Display Rivet version in Apache signature" OFF)
 option(head-requests              "Returns real headers in response to a HEAD request" OFF)
 option(single-thread              "forces the worker brigde to create a single thread (debug)" OFF)
@@ -34,7 +35,13 @@ option(import-rivet-commands      "requi
 option(virtual-interps-separation "to turn on virtual host separation" OFF)
 option(requests-serialization     "Forces HTTP requests serialization among threads(debug)" OFF)
 option(upload-var                 "whether files are uploaded to Tcl variables" ON)
-option(BUILD_SHARED_LIBS          "build as shared libraries" ON)
+option(BUILD_SHARED_LIBS          "build and link with shared libraries" ON)
+option(TCL_THREADS                "build with threads" ON)
+option(TCL_MEM_DEBUG              "build with memory debugging" OFF)
+
+include(CMakeDependentOption)
+CMAKE_DEPENDENT_OPTION(BUILD_STATIC_LIBS "build as static library" ON
+                       "NOT BUILD_SHARED_LIBS" OFF)
 
 # Offer the user the choice of overriding the installation directories
 set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
@@ -250,6 +257,7 @@ endif()
 if(upload-var)
   set(UPLOAD_FILES_TO_VAR 1)
 endif()
+set(UPLOAD_DIR ${with-upload-dir})
 
 #  Location of the Rivet library...
 # ===========================================================================
@@ -257,7 +265,20 @@ if(NOT DEFINED RIVETLIB_DESTDIR)
   set(RIVETLIB_DESTDIR "${APACHE_LIB_DIR}rivet${RIVET_VERSION}")
 endif(NOT DEFINED RIVETLIB_DESTDIR)
 
-#  Set variables for generatting config files...
+if(TCL_THREADS)
+  set(TCL_THREADS 1)
+  if(NOT WIN32)
+    set(USE_THREAD_ALLOC 1)
+    set(_REENTRANT       1)
+    set(_THREAD_SAFE     1)
+    STRING (REGEX MATCH "SunOS" PROJECT_OS_SunOS ${CMAKE_SYSTEM_NAME})
+    if(PROJECT_OS_SunOS)
+      set(_POSIX_PTHREAD_SEMANTICS 1)
+    endif(PROJECT_OS_SunOS)
+  endif(NOT WIN32)
+endif(TCL_THREADS)
+
+#  Set variables for generating config files...
 # ===========================================================================
 set(RIVET_AC_APPLE_UNIVERSAL_BUILD ${AC_APPLE_UNIVERSAL_BUILD})
 set(RIVET_CONFIGURE_CMD            ${CONFIGURE_CMD})
@@ -304,6 +325,7 @@ set(RIVET_TCL_WIDE_INT_IS_LONG     ${TCL
 set(RIVET_TCL_WIDE_INT_TYPE        ${TCL_WIDE_INT_TYPE})
 set(RIVET_UNDER_CE                 ${UNDER_CE})
 set(RIVET_UPLOAD_FILES_TO_VAR      ${UPLOAD_FILES_TO_VAR})
+set(RIVET_UPLOAD_DIR               ${UPLOAD_DIR})
 set(RIVET_USE_THREAD_ALLOC         ${USE_THREAD_ALLOC})
 set(RIVET__ISOC99_SOURCE           ${_ISOC99_SOURCE})
 set(RIVET__LARGEFILE64_SOURCE      ${_LARGEFILE64_SOURCE})

Modified: tcl/rivet/branches/cmake/cmake/cmake_extra_modules/checks.cmake
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/cmake/cmake/cmake_extra_modules/checks.cmake?rev=1804024&r1=1804023&r2=1804024&view=diff
==============================================================================
--- tcl/rivet/branches/cmake/cmake/cmake_extra_modules/checks.cmake (original)
+++ tcl/rivet/branches/cmake/cmake/cmake_extra_modules/checks.cmake Thu Aug  3 17:38:22 2017
@@ -23,20 +23,117 @@ check_include_files(errno.h        HAVE_
 check_include_files(float.h        HAVE_FLOAT_H)
 check_include_files(sys/wait.h     HAVE_SYS_WAIT_H)
 check_include_files(values.h       HAVE_VALUES_H)
+check_include_files(stdarg.h       HAVE_STDARG_H)
 
 # Check functions
 include(CheckFunctionExists)
 check_function_exists(fseek64      HAVE_FSEEK64)
 check_function_exists(open64       HAVE_OPEN64)
-check_function_exists(memcpy HAVE_MEMCPY )
-check_function_exists(mmap HAVE_MMAP )
+check_function_exists(memcpy       HAVE_MEMCPY)
+check_function_exists(mmap         HAVE_MMAP)
+check_function_exists(lseek64      HAVE_LSEEK64)
 
 # Check types
 include ( CheckTypeSize )
 check_type_size ( "long double" HAVE_LONG_DOUBLE )
-check_type_size ( "double" SIZEOF_DOUBLE )
+check_type_size ( "double"      SIZEOF_DOUBLE )
 check_type_size ( "long double" SIZEOF_LONG_DOUBLE )
-check_type_size ( "void*" SIZEOF_VOID_P )
+check_type_size ( "void*"       SIZEOF_VOID_P )
+# set(CMAKE_EXTRA_INCLUDE_FILES sys/stat.h)
+# check_type_size("struct stat64" _LARGEFILE64_SOURCE)
+# set(CMAKE_EXTRA_INCLUDE_FILES)
+
+# Check symbols
+include(CheckSymbolExists) 
+
+# Custom checks...
+include (CheckCSourceCompiles)
+check_c_source_compiles("#include <sys/types.h>
+int main () { off64_t offset; return 0;}" HAVE_TYPE_OFF64_T)
+
+check_c_source_compiles("#include <sys/stat.h>
+int main () { struct stat64 p; return 0;}" HAVE_STRUCT_STAT64)
+check_c_source_compiles("#include <sys/types.h>
+#include <sys/dirent.h>
+int main () { struct dirent64 p; return 0;}" HAVE_STRUCT_DIRENT64)
+
+check_c_source_compiles("#include <sys/stat.h>
+int main () {struct stat64 buf; int i = stat64(\"/\", &buf); return 0;}"
+NO_LARGEFILE64_SOURCE)
+if(NOT NO_LARGEFILE64_SOURCE)
+check_c_source_compiles("#define _LARGEFILE64_SOURCE 1
+#include <sys/stat.h>
+int main () {struct stat64 buf; int i = stat64(\"/\", &buf); return 0;}"
+                        _LARGEFILE64_SOURCE)
+endif(NOT NO_LARGEFILE64_SOURCE)
+
+check_c_source_compiles("#include <stdlib.h>
+int main () {char *p = (char *)strtoll; char *q = (char *)strtoull; return 0;}"
+NO_ISOC99_SOURCE)
+if(NOT NO_ISOC99_SOURCE)
+check_c_source_compiles("#define _ISOC99_SOURCE 1
+#include <stdlib.h>
+int main () {char *p = (char *)strtoll; char *q = (char *)strtoull; return 0;}"
+                        _ISOC99_SOURCE)
+endif(NOT NO_ISOC99_SOURCE)
+
+check_c_source_compiles("#include <sys/stat.h>
+int main () {char *p = (char *)open64; return 0;}"
+NO_LARGEFILE_SOURCE64)
+if(NOT NO_LARGEFILE_SOURCE64)
+check_c_source_compiles("#define _LARGEFILE_SOURCE64 1
+#include <sys/stat.h>
+int main () {char *p = (char *)open64; return 0;}"
+                        _LARGEFILE_SOURCE64)
+endif(NOT NO_LARGEFILE_SOURCE64)
+
+# See if the compiler knows natively about __int64
+set(tcl_cv_type_64bit "none")
+check_c_source_compiles("int main () {__int64 value = (__int64) 0; return 0;}"
+HAS___int64)
+if(HAS___int64)
+  set(tcl_type_64bit "__int64")
+else(HAS___int64)
+  set(tcl_type_64bit "long long")
+endif(HAS___int64)
+check_c_source_compiles("int main () {switch (0) {case 1:
+case (sizeof(${tcl_type_64bit})==sizeof(long)): ; }; return 0;}"
+HAS_WIDE_INT_NE_LONG)
+if(HAS_WIDE_INT_NE_LONG)
+  set(tcl_cv_type_64bit ${tcl_type_64bit})
+endif(HAS_WIDE_INT_NE_LONG)
+
+if(${tcl_cv_type_64bit} STREQUAL "none")
+  set(TCL_WIDE_INT_IS_LONG 1)
+elseif((${tcl_cv_type_64bit} STREQUAL "__int64") AND WIN32)
+else(${tcl_cv_type_64bit} STREQUAL "none")
+  set(TCL_WIDE_INT_TYPE ${tcl_cv_type_64bit})
+endif(${tcl_cv_type_64bit} STREQUAL "none")
+
+#  Check for ANSI C header files...
+# ==========================================================================
+message(STATUS "Cheking for ANSI C header files...")
+if(HAVE_STDLIB_H AND HAVE_STDARG_H AND HAVE_STRING_H AND HAVE_FLOAT_H)
+  set(ac_cv_header_stdc ON)
+endif(HAVE_STDLIB_H AND HAVE_STDARG_H AND HAVE_STRING_H AND HAVE_FLOAT_H)
+
+if(ac_cv_header_stdc)
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  SET(CMAKE_EXTRA_INCLUDE_FILES string.h)
+  check_function_exists(memchr ac_cv_header_stdc)
+  SET(CMAKE_EXTRA_INCLUDE_FILES)
+endif(ac_cv_header_stdc)
+
+if(ac_cv_header_stdc)
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  SET(CMAKE_EXTRA_INCLUDE_FILES stdlib.h)
+  check_function_exists(free ac_cv_header_stdc)
+  SET(CMAKE_EXTRA_INCLUDE_FILES)
+endif(ac_cv_header_stdc)
+
+if(ac_cv_header_stdc)
+  set(STDC_HEADERS 1)
+endif(ac_cv_header_stdc)
 
 if(NOT HAVE_DIRENT_H)
   set(NO_DIRENT_H 1)
@@ -73,3 +170,7 @@ endif()
 if(NOT HAVE_STRING_H)
   set(NO_STRING_H 1)
 endif()
+
+if(BUILD_STATIC_LIBS)
+  set(STATIC_BUILD 1)
+endif(BUILD_STATIC_LIBS)

Modified: tcl/rivet/branches/cmake/cmake/cmake_extra_modules/rivet_config.h.cmake
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/cmake/cmake/cmake_extra_modules/rivet_config.h.cmake?rev=1804024&r1=1804023&r2=1804024&view=diff
==============================================================================
--- tcl/rivet/branches/cmake/cmake/cmake_extra_modules/rivet_config.h.cmake (original)
+++ tcl/rivet/branches/cmake/cmake/cmake_extra_modules/rivet_config.h.cmake Thu Aug  3 17:38:22 2017
@@ -9,70 +9,114 @@
  */
 
 /* Define if building universal (internal helper macro) */
+#ifndef RIVET_AC_APPLE_UNIVERSAL_BUILD
 #cmakedefine RIVET_AC_APPLE_UNIVERSAL_BUILD @AC_APPLE_UNIVERSAL_BUILD@
+#endif
 
 /* configure command string */
+#ifndef RIVET_CONFIGURE_CMD
 #cmakedefine RIVET_CONFIGURE_CMD "@CONFIGURE_CMD@"
+#endif
 
 /* Display Rivet version in Apache signature */
-#cmakedefine RIVET_DISPLAY_VERSION @DISPLAY_VERSION@
+#ifndef RIVET_DISPLAY_VERSION
+#cmakedefine01 RIVET_DISPLAY_VERSION
+#endif
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
+#ifndef RIVET_HAVE_DLFCN_H
 #cmakedefine RIVET_HAVE_DLFCN_H @HAVE_DLFCN_H@
+#endif
 
 /* Define to 1 if you have the <inttypes.h> header file. */
+#ifndef RIVET_HAVE_INTTYPES_H
 #cmakedefine RIVET_HAVE_INTTYPES_H @HAVE_INTTYPES_H@
+#endif
 
 /* Define to 1 if you have the <limits.h> header file. */
+#ifndef RIVET_HAVE_LIMITS_H
 #cmakedefine RIVET_HAVE_LIMITS_H @HAVE_LIMITS_H@
+#endif
 
 /* Define to 1 if you have the `lseek64' function. */
+#ifndef RIVET_HAVE_LSEEK64
 #cmakedefine RIVET_HAVE_LSEEK64 @HAVE_LSEEK64@
+#endif
 
 /* Define to 1 if you have the <memory.h> header file. */
+#ifndef RIVET_HAVE_MEMORY_H
 #cmakedefine RIVET_HAVE_MEMORY_H @HAVE_MEMORY_H@
+#endif
 
 /* Define to 1 if you have the <net/errno.h> header file. */
+#ifndef RIVET_HAVE_NET_ERRNO_H
 #cmakedefine RIVET_HAVE_NET_ERRNO_H @HAVE_NET_ERRNO_H@
+#endif
 
 /* Define to 1 if you have the `open64' function. */
+#ifndef RIVET_HAVE_OPEN64
 #cmakedefine RIVET_HAVE_OPEN64 @HAVE_OPEN64@
+#endif
 
 /* Define to 1 if you have the <stdint.h> header file. */
+#ifndef RIVET_HAVE_STDINT_H
 #cmakedefine RIVET_HAVE_STDINT_H @HAVE_STDINT_H@
+#endif
 
 /* Define to 1 if you have the <stdlib.h> header file. */
+#ifndef RIVET_HAVE_STDLIB_H
 #cmakedefine RIVET_HAVE_STDLIB_H @HAVE_STDLIB_H@
+#endif
 
 /* Define to 1 if you have the <strings.h> header file. */
+#ifndef RIVET_HAVE_STRINGS_H
 #cmakedefine RIVET_HAVE_STRINGS_H @HAVE_STRINGS_H@
+#endif
 
 /* Define to 1 if you have the <string.h> header file. */
+#ifndef RIVET_HAVE_STRING_H
 #cmakedefine RIVET_HAVE_STRING_H @HAVE_STRING_H@
+#endif
 
 /* Is 'struct dirent64' in <sys/types.h>? */
-/* #undef HAVE_STRUCT_DIRENT64 */
+#ifndef RIVET_HAVE_STRUCT_DIRENT64
+#cmakedefine RIVET_HAVE_STRUCT_DIRENT64 @HAVE_STRUCT_DIRENT64@
+#endif
 
 /* Is 'struct stat64' in <sys/stat.h>? */
-/* #undef HAVE_STRUCT_STAT64 */
+#ifndef RIVET_HAVE_STRUCT_STAT64
+#cmakedefine RIVET_HAVE_STRUCT_STAT64 @HAVE_STRUCT_STAT64@
+#endif
 
 /* Define to 1 if you have the <sys/param.h> header file. */
+#ifndef RIVET_HAVE_SYS_PARAM_H
 #cmakedefine RIVET_HAVE_SYS_PARAM_H @HAVE_SYS_PARAM_H@
+#endif
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
+#ifndef RIVET_HAVE_SYS_STAT_H
 #cmakedefine RIVET_HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@
+#endif
 
 /* Define to 1 if you have the <sys/types.h> header file. */
+#ifndef RIVET_HAVE_SYS_TYPES_H
 #cmakedefine RIVET_HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@
+#endif
 
 /* Is off64_t in <sys/types.h>? */
-/* #undef HAVE_TYPE_OFF64_T */
+#ifndef RIVET_HAVE_TYPE_OFF64_T
+#cmakedefine RIVET_HAVE_TYPE_OFF64_T @HAVE_TYPE_OFF64_T@
+#endif
 
 /* Define to 1 if you have the <unistd.h> header file. */
+#ifndef RIVET_HAVE_UNISTD_H
 #cmakedefine RIVET_HAVE_UNISTD_H @HAVE_UNISTD_H@
+#endif
 
 /* Honor HEAD requests */
+#ifndef RIVET_HEAD_REQUESTS
 #cmakedefine01 RIVET_HEAD_REQUESTS
+#endif
 
 /* Rivet Tcl package version */
 #ifndef RIVET_INIT_VERSION
@@ -95,7 +139,9 @@
 #endif
 
 /* yes, MPM worker single thread */
+#ifndef RIVET_MPM_SINGLE_TCL_THREAD
 #cmakedefine RIVET_MPM_SINGLE_TCL_THREAD @MPM_SINGLE_TCL_THREAD@
+#endif
 
 /* The path to a working tclsh executable */
 #ifndef RIVET_NAMEOFEXECUTABLE
@@ -103,42 +149,70 @@
 #endif
 
 /* commands will not be exported */
+#ifndef RIVET_NAMESPACE_EXPORT
 #cmakedefine01 RIVET_NAMESPACE_EXPORT
+#endif
 
 /* good, no automatic import will be done */
+#ifndef RIVET_NAMESPACE_IMPORT
 #cmakedefine01 RIVET_NAMESPACE_IMPORT
+#endif
 
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.  */
+#ifndef RIVET_HAVE_DIRENT_H
 #cmakedefine RIVET_HAVE_DIRENT_H @HAVE_DIRENT_H@
+#endif
+#ifndef RIVET_NO_DIRENT_H
 #cmakedefine RIVET_NO_DIRENT_H @NO_DIRENT_H@
+#endif
 
 /* Do we have <dlfcn.h>? */
+#ifndef RIVET_NO_DLFCN_H
 #cmakedefine RIVET_NO_DLFCN_H @NO_DLFCN_H@
+#endif
 
 /* Do we have <errno.h>? */
+#ifndef RIVET_NO_ERRNO_H
 #cmakedefine RIVET_NO_ERRNO_H @NO_ERRNO_H@
+#endif
 
 /* Do we have <float.h>? */
+#ifndef RIVET_NO_FLOAT_H
 #cmakedefine RIVET_NO_FLOAT_H @NO_FLOAT_H@
+#endif
 
 /* Define to 1 if you have the <limits.h> header file. */
+#ifndef RIVET_HAVE_LIMITS_H
 #cmakedefine RIVET_HAVE_LIMITS_H @HAVE_LIMITS_H@
+#endif
+#ifndef RIVET_NO_LIMITS_H
 #cmakedefine RIVET_NO_LIMITS_H @NO_LIMITS_H@
+#endif
 
 /* Do we have <stdlib.h>? */
+#ifndef RIVET_NO_STDLIB_H
 #cmakedefine RIVET_NO_STDLIB_H @NO_STDLIB_H@
+#endif
 
 /* Do we have <string.h>? */
+#ifndef RIVET_NO_STRING_H
 #cmakedefine RIVET_NO_STRING_H @NO_STRING_H@
+#endif
 
 /* Do we have <sys/wait.h>? */
+#ifndef RIVET_NO_SYS_WAIT_H
 #cmakedefine RIVET_NO_SYS_WAIT_H @NO_SYS_WAIT_H@
+#endif
 
 /* Do we have <values.h>? */
+#ifndef RIVET_NO_VALUES_H
 #cmakedefine RIVET_NO_VALUES_H @NO_VALUES_H@
+#endif
 
 /* No description provided for NO_VIZ... */
+#ifndef RIVET_NO_VIZ
 #cmakedefine RIVET_NO_VIZ
+#endif
 
 /* Name of package */
 #ifndef RIVET_PACKAGE
@@ -196,28 +270,44 @@
 #endif
 
 /* requests will be serialized */
+#ifndef RIVET_SERIALIZE_HTTP_REQUESTS
 #cmakedefine RIVET_SERIALIZE_HTTP_REQUESTS @SERIALIZE_HTTP_REQUESTS@
+#endif
 
 /* Is this a static build? */
+#ifndef RIVET_STATIC_BUILD
 #cmakedefine RIVET_STATIC_BUILD @STATIC_BUILD@
+#endif
 
 /* Define to 1 if you have the ANSI C header files. */
+#ifndef RIVET_STDC_HEADERS
 #cmakedefine RIVET_STDC_HEADERS @STDC_HEADERS@
+#endif
 
 /* Is memory debugging enabled? */
+#ifndef RIVET_TCL_MEM_DEBUG
 #cmakedefine RIVET_TCL_MEM_DEBUG @TCL_MEM_DEBUG@
+#endif
 
 /* Are we building with threads enabled? */
-#cmakedefine RIVET_TCL_THREADS @TCL_THREADS@
+#ifndef RIVET_TCL_THREADS
+#cmakedefine RIVET_TCL_THREADS 1
+#endif
 
 /* Are wide integers to be implemented with C 'long's? */
+#ifndef RIVET_TCL_WIDE_INT_IS_LONG
 #cmakedefine RIVET_TCL_WIDE_INT_IS_LONG @TCL_WIDE_INT_IS_LONG@
+#endif
 
 /* What type should be used to define wide integers? */
+#ifndef RIVET_TCL_WIDE_INT_TYPE
 #cmakedefine RIVET_TCL_WIDE_INT_TYPE @TCL_WIDE_INT_TYPE@
+#endif
 
 /* UNDER_CE version */
+#ifndef RIVET_UNDER_CE
 #cmakedefine RIVET_UNDER_CE @UNDER_CE@
+#endif
 
 /* Path to the disk directory where uploads are saved */
 #ifndef RIVET_UPLOAD_DIR
@@ -252,7 +342,9 @@
 #endif
 
 /* Add the _ISOC99_SOURCE flag when building */
+#ifndef RIVET__ISOC99_SOURCE
 #cmakedefine RIVET__ISOC99_SOURCE @_ISOC99_SOURCE@
+#endif
 
 /* Add the _LARGEFILE64_SOURCE flag when building */
 #ifndef RIVET__LARGEFILE64_SOURCE
@@ -260,25 +352,39 @@
 #endif
 
 /* Add the _LARGEFILE_SOURCE64 flag when building */
+#ifndef RIVET__LARGEFILE_SOURCE64
 #cmakedefine RIVET__LARGEFILE_SOURCE64 @_LARGEFILE_SOURCE64@
+#endif
 
 /* # needed in sys/socket.h Should OS/390 do the right thing with sockets? */
+#ifndef RIVET__OE_SOCKETS
 #cmakedefine RIVET__OE_SOCKETS @_OE_SOCKETS@
+#endif
 
 /* Do we really want to follow the standard? Yes we do! */
+#ifndef RIVET__POSIX_PTHREAD_SEMANTICS
 #cmakedefine RIVET__POSIX_PTHREAD_SEMANTICS @_POSIX_PTHREAD_SEMANTICS@
+#endif
 
 /* Do we want the reentrant OS API? */
+#ifndef RIVET__REENTRANT
 #cmakedefine RIVET__REENTRANT @_REENTRANT@
+#endif
 
 /* Do we want the thread-safe OS API? */
+#ifndef RIVET__THREAD_SAFE
 #cmakedefine RIVET__THREAD_SAFE @_THREAD_SAFE@
+#endif
 
 /* _WIN32_WCE version */
+#ifndef RIVET__WIN32_WCE
 #cmakedefine RIVET__WIN32_WCE @_WIN32_WCE@
+#endif
 
 /* Do we want to use the XOPEN network library? */
+#ifndef RIVET__XOPEN_SOURCE_EXTENDED
 #cmakedefine RIVET__XOPEN_SOURCE_EXTENDED @_XOPEN_SOURCE_EXTENDED@
+#endif
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */



---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org