From 13eee814c9d9e5c7b4cf0e0f55c23951fec443f2 Mon Sep 17 00:00:00 2001
From: Juergen Kahrs <Juergen.Kahrs@googlemail.com>
Date: Sun, 17 Feb 2013 21:58:56 +0100
Subject: USE_CONFIG_H is now ON be default. Found clean implementation for
 DYNAMIC and SHLIBEXT.

---
 cmake/configure.cmake | 19 ++++++++++++++-----
 doc/CMakeLists.txt    |  1 -
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index 9e896284..38265b98 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -24,7 +24,7 @@
 
 ## process this file with CMake to produce Makefile
 
-option (USE_CONFIG_H          "Generate a file config.h for inclusion into C source code" OFF)
+option (USE_CONFIG_H          "Generate a file config.h for inclusion into C source code" ON)
 if (USE_CONFIG_H)
   file( WRITE config.h "/* all settings defined by CMake. */\n\n" )
   ADD_DEFINITIONS (-D HAVE_CONFIG_H)
@@ -109,10 +109,19 @@ 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}\\")
-add_definitions(-D SHLIBEXT=\\"so\\")
+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)
+  STRING( REGEX REPLACE "^(\\.)([a-zA-Z0-9])" "\\2" SHLIBEXT "${CMAKE_SHARED_LIBRARY_SUFFIX}") 
+  DefineConfigHValue(SHLIBEXT \\"${SHLIBEXT}\\")
+  message(STATUS "Found SHLIBEXT: ${SHLIBEXT}")
+else()
+  message(STATUS "Found no SHLIBEXT")
+endif()
 DefineTypeIfAvailable("unsigned int" SIZEOF_UNSIGNED_INT)
 DefineTypeIfAvailable("unsigned long" SIZEOF_UNSIGNED_LONG)
 #/* Define to 1 if *printf supports %F format */
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 478b1c11..299f52a9 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -41,7 +41,6 @@ if (DVIPS_CONVERTER)
     COMMAND dvips -o gawkinet.ps gawkinet.dvi
   )
   if (PS2PDF_CONVERTER)
-    message(STATUS "Converting .ps to .pdf")
     add_custom_command(
       TARGET doc
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-- 
cgit v1.2.3