From 08fc54511a406a767652b617f9c8e293e794258a Mon Sep 17 00:00:00 2001
From: Juergen Kahrs <Juergen.Kahrs@googlemail.com>
Date: Sun, 17 Feb 2013 15:12:46 +0100
Subject: Pass a few more defined via config.h.

---
 cmake/configure.cmake | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index a4f3161f..b0640706 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -56,6 +56,11 @@ MACRO(DefineConfigH feature)
   endif ()
 ENDMACRO(DefineConfigH)
 
+MACRO(DefineConfigHValue feature value)
+  set(${feature} ${value})
+  DefineConfigH(${feature})
+ENDMACRO(DefineConfigHValue)
+
 MACRO(DefineFunctionIfAvailable func feature)
   check_function_exists("${func}" "${feature}")
   DefineConfigH(${feature})
@@ -92,16 +97,18 @@ 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.
 add_definitions(-DGAWK)
-set(GAWK_VERSION "${GAWK_MAJOR_VERSION}.${GAWK_MINOR_VERSION}.${GAWK_BUGFIX_VERSION}")
-add_definitions(-D VERSION=\\"${GAWK_VERSION}\\")
-add_definitions(-D PACKAGE=\\"gawk\\")
-add_definitions(-D PACKAGE_STRING="GNU Awk ${GAWK_VERSION}")
-add_definitions(-D PACKAGE_TARNAME=\\"gawk\\")
-add_definitions(-D PACKAGE_URL=\\"http://www.gnu.org/software/gawk/\\")
-add_definitions(-D PACKAGE_VERSION=\\"${GAWK_VERSION}\\")
-add_definitions(-D DEFPATH=\\"${CMAKE_BINARY_DIR}/awk\\")
-add_definitions(-D DEFLIBPATH=\\"${CMAKE_BINARY_DIR}/lib\\")
+DefineConfigHValue(GAWK_VERSION "${GAWK_MAJOR_VERSION}.${GAWK_MINOR_VERSION}.${GAWK_BUGFIX_VERSION}")
+DefineConfigHValue(VERSION \\"${GAWK_VERSION}\\")
+DefineConfigHValue(PACKAGE \\"gawk\\")
+DefineConfigHValue(PACKAGE_STRING "GNU Awk ${GAWK_VERSION}")
+DefineConfigHValue(PACKAGE_TARNAME \\"gawk\\")
+DefineConfigHValue(PACKAGE_URL \\"http://www.gnu.org/software/gawk/\\")
+DefineConfigHValue(PACKAGE_VERSION \\"${GAWK_VERSION}\\")
+DefineConfigHValue(DEFPATH \\"${CMAKE_BINARY_DIR}/awk\\")
+DefineConfigHValue(DEFLIBPATH \\"${CMAKE_BINARY_DIR}/lib\\")
 #DefineFunctionIfAvailable(dlopen DYNAMIC)
 DefineHFileIfAvailable(dlfcn.h DYNAMIC)
 #add_definitions(-D SHLIBEXT=\\"${CMAKE_SHARED_LIBRARY_SUFFIX}\\")
-- 
cgit v1.2.3