config.h.cmake

- Set SIZEOF_VOIDP the same way as others
 - Unindent the no Mac OS settings, to let the checker scripts find the lines
 - Removed duplicate SIZEOF_SIZE_T setting
 - Added missing value for HAVE_CHARSET_ascii

configure.cmake
 - Added HAVE_ prefix to library names, like HAVE_LIBM
 - Set HAVE_CXXABI_H if header is found, HAVE_ABI_CXA_DEMANGLE
   controls if useful
 - Set SIZEOF_VOIDP the same way as others

config.h.cmake

@@ -308,21 +308,21 @@
   #else
     #define SIZEOF_LONG 4
   #endif
+  #define SIZEOF_VOIDP   SIZEOF_LONG
   #define SIZEOF_CHARP   SIZEOF_LONG
   #define SIZEOF_SIZE_T  SIZEOF_LONG
 #else
-  #cmakedefine SIZEOF_LONG   @SIZEOF_LONG@
-  #cmakedefine SIZEOF_CHARP  @SIZEOF_CHARP@
-  #cmakedefine SIZEOF_SIZE_T @SIZEOF_CHARP@
+# No indentation, to fetch the lines from verification scripts
+#cmakedefine SIZEOF_LONG   @SIZEOF_LONG@
+#cmakedefine SIZEOF_VOIDP  @SIZEOF_VOIDP@
+#cmakedefine SIZEOF_CHARP  @SIZEOF_CHARP@
+#cmakedefine SIZEOF_SIZE_T @SIZEOF_CHARP@
 #endif
 
 #cmakedefine SIZEOF_CHAR @SIZEOF_CHAR@
 #cmakedefine HAVE_CHAR 1
 #cmakedefine HAVE_LONG 1
 #cmakedefine HAVE_CHARP 1
-#if SIZEOF_CHARP
-# define SIZEOF_VOIDP SIZEOF_CHARP 
-#endif
 #cmakedefine SIZEOF_SHORT @SIZEOF_SHORT@
 #cmakedefine HAVE_SHORT 1
 #cmakedefine SIZEOF_INT @SIZEOF_INT@
@@ -333,7 +333,6 @@
 #cmakedefine HAVE_OFF_T 1
 #cmakedefine SIZEOF_SIGSET_T @SIZEOF_SIGSET_T@
 #cmakedefine HAVE_SIGSET_T 1
-#cmakedefine SIZEOF_SIZE_T @SIZEOF_SIZE_T@
 #cmakedefine HAVE_SIZE_T 1
 #cmakedefine SIZEOF_UCHAR @SIZEOF_UCHAR@
 #cmakedefine HAVE_UCHAR 1
@@ -518,7 +517,7 @@
 #cmakedefine FN_NO_CASE_SENSE 1
 
 #cmakedefine HAVE_CHARSET_armscii8 1
-#cmakedefine HAVE_CHARSET_ascii 
+#cmakedefine HAVE_CHARSET_ascii 1
 #cmakedefine HAVE_CHARSET_big5 1
 #cmakedefine HAVE_CHARSET_cp1250 1
 #cmakedefine HAVE_CHARSET_cp1251 1

configure.cmake

@@ -105,7 +105,7 @@ FUNCTION(MY_SEARCH_LIBS func libs result)
   FOREACH(lib  ${libs})
     CHECK_LIBRARY_EXISTS(${lib} ${func} "" HAVE_${func}_IN_${lib}) 
     IF(HAVE_${func}_IN_${lib})
-      SET(${result} ${lib} PARENT_SCOPE)
+      SET(${result} HAVE_${lib} PARENT_SCOPE)
       RETURN()
     ENDIF()
   ENDFOREACH()
@@ -167,6 +167,7 @@ CHECK_INCLUDE_FILES (alloca.h HAVE_ALLOCA_H)
 CHECK_INCLUDE_FILES (aio.h HAVE_AIO_H)
 CHECK_INCLUDE_FILES (arpa/inet.h HAVE_ARPA_INET_H)
 CHECK_INCLUDE_FILES (crypt.h HAVE_CRYPT_H)
+CHECK_INCLUDE_FILES (cxxabi.h HAVE_CXXABI_H)
 CHECK_INCLUDE_FILES (dirent.h HAVE_DIRENT_H)
 CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H)
 CHECK_INCLUDE_FILES (execinfo.h HAVE_EXECINFO_H)
@@ -479,6 +480,7 @@ ENDIF(HAVE_STDINT_H)
 IF(NOT APPLE)
   # Prevent some checks on OSX, they return ambigious results
   # on universal 32/64 bit binariess
+  MY_CHECK_TYPE_SIZE("void *" VOIDP)
   MY_CHECK_TYPE_SIZE("char *" CHARP)
   MY_CHECK_TYPE_SIZE(long LONG)
   MY_CHECK_TYPE_SIZE(size_t SIZE_T)
@@ -776,7 +778,7 @@ ENDIF(NOT HAVE_POSIX_SIGNALS)
 # Assume regular sprintf
 SET(SPRINTFS_RETURNS_INT 1)
 
-IF(CMAKE_COMPILER_IS_GNUXX)
+IF(CMAKE_COMPILER_IS_GNUXX AND HAVE_CXXABI_H)
 CHECK_CXX_SOURCE_COMPILES("
  #include <cxxabi.h>
  int main(int argc, char **argv) 
@@ -786,9 +788,6 @@ CHECK_CXX_SOURCE_COMPILES("
     return 0;
   }"
   HAVE_ABI_CXA_DEMANGLE)
-IF(HAVE_ABI_CXA_DEMANGLE)
- SET(HAVE_CXXABI_H 1)
-ENDIF()
 ENDIF()
 
 CHECK_C_SOURCE_COMPILES("