Merge pull request #1346 from kbevers/backport-system-errmsg-fix

[Backport] Build: automatically enable system error messages

cmake/ProjConfig.cmake

@@ -24,7 +24,8 @@ check_include_files (sys/types.h HAVE_SYS_TYPES_H)
 check_include_files (unistd.h HAVE_UNISTD_H)
 check_include_files("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
 
-CHECK_FUNCTION_EXISTS(localeconv HAVE_LOCALECONV)
+check_function_exists(localeconv HAVE_LOCALECONV)
+check_function_exists(strerror HAVE_STRERROR)
 
 # check libm need on unix 
 check_library_exists(m ceil "" HAVE_LIBM) 

cmake/proj_config.cmake.in

@@ -22,6 +22,9 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #cmakedefine HAVE_STDLIB_H 1
 
+/* Define to 1 if you have the `strerror' function. */
+#cmakedefine HAVE_STRERROR 1
+
 /* Define to 1 if you have the <strings.h> header file. */
 #cmakedefine HAVE_STRINGS_H 1
 

configure.ac

@@ -219,6 +219,7 @@ CFLAGS="$save_CFLAGS $C99_MATH"
 AC_SEARCH_LIBS([sqrt], [m])
 
 AC_CHECK_FUNC(localeconv, [AC_DEFINE(HAVE_LOCALECONV,1,[Define to 1 if you have localeconv])])
+AC_CHECK_FUNCS([strerror])
 
 dnl ---------------------------------------------------------------------------
 dnl Check for JNI support.

src/apps/emess.cpp

@@ -20,6 +20,7 @@
 #include <string.h>
 
 #include "proj_api.h"
+#include "proj_config.h"
 #define EMESS_ROUTINE
 #include "emess.h"