[gawk-diffs] [SCM] gawk branch, cmake, updated. 451a255062f7e54bb6654ea8ea437cfbb4ec929d

[Juergen Kahrs]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, cmake has been updated
       via  451a255062f7e54bb6654ea8ea437cfbb4ec929d (commit)
      from  b02fb9b76e40a94cdaad17b7d1a720a71f8f8eb0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=451a255062f7e54bb6654ea8ea437cfbb4ec929d

commit 451a255062f7e54bb6654ea8ea437cfbb4ec929d
Author: Juergen Kahrs <address@hidden>
Date:   Sat Mar 9 21:11:34 2013 +0100

    Dynamic extensions can be invoked now on Windows. DYNAMIC 1 will be set if 
CMAKE_SHARED_LIBRARY_SUFFIX exists (and not if CMAKE_DL_LIBS, as it was up to 
now). ext.c can now be compiled with DYNAMIC set because of 
include_directories(${CMAKE_SOURCE_DIR}/pc (thanks to Eli for the hint).

diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index cd66e24..d7e44cf 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -97,8 +97,8 @@ STRING( REGEX REPLACE ".*([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" 
GAWK_MAJOR_VERSION
 STRING( REGEX REPLACE ".*[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" 
GAWK_MINOR_VERSION "${GAWK_AUTOMAKE_LINE_VERSION}") 
 STRING( REGEX REPLACE ".*[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" 
GAWK_BUGFIX_VERSION "${GAWK_AUTOMAKE_LINE_VERSION}") 
 
-# The definition for GAWK cannot be passed in config.he because
-# the extensions will fail to build.
+# The definition of the symbol GAWK cannot be passed in config.h
+# because the extensions will fail to build.
 add_definitions(-DGAWK)
 DefineConfigHValue(GAWK_VERSION 
"${GAWK_MAJOR_VERSION}.${GAWK_MINOR_VERSION}.${GAWK_BUGFIX_VERSION}")
 DefineConfigHValue(VERSION \\"${GAWK_VERSION}\\")
@@ -111,11 +111,11 @@ DefineConfigHValue(DEFPATH \\"${CMAKE_BINARY_DIR}/awk\\")
 DefineConfigHValue(DEFLIBPATH \\"${CMAKE_BINARY_DIR}/lib\\")
 if (CMAKE_DL_LIBS)
   message(STATUS "Found CMAKE_DL_LIBS:${CMAKE_DL_LIBS}")
-  DefineConfigHValue(DYNAMIC 1)
 else()
   message(STATUS "Found no CMAKE_DL_LIBS")
 endif()
 if (CMAKE_SHARED_LIBRARY_SUFFIX)
+  DefineConfigHValue(DYNAMIC 1)
   STRING( REGEX REPLACE "^(\\.)([a-zA-Z0-9])" "\\2" SHLIBEXT 
"${CMAKE_SHARED_LIBRARY_SUFFIX}") 
   DefineConfigHValue(SHLIBEXT \\"${SHLIBEXT}\\")
   message(STATUS "Found SHLIBEXT: ${SHLIBEXT}")
@@ -267,7 +267,7 @@ if (CMAKE_HOST_UNIX)
   include(GetPrerequisites)
 endif()
 
-# For some unknown reason the defines for the extension
+# For some unknown reason the defines for the extensions
 # are written into config.h only if they are implemented
 # here and not in extension/CMakeLists.txt.
 DefineLibraryIfAvailable(m    sin         "" HAVE_LIBM)

-----------------------------------------------------------------------

Summary of changes:
 cmake/configure.cmake |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
gawk