aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Mayo <aklhfex@gmail.com>2019-03-21 19:53:37 +0000
committerChris Mayo <aklhfex@gmail.com>2019-03-21 19:53:37 +0000
commitddd333e6bd6f5e033a2b829067910165e64eb0b9 (patch)
treeb64d09c9858e28c685abf7a233d029e29a9cae45
parent9ead1bfe5afd7e519fe5f83b6603e5147fa91411 (diff)
downloadPROJ-ddd333e6bd6f5e033a2b829067910165e64eb0b9.tar.gz
PROJ-ddd333e6bd6f5e033a2b829067910165e64eb0b9.zip
Build: automatically enable system error messages
Define HAVE_STRERROR during configuration. Before: $ cs2cs +proj=latlong +to +proj=latlong dummy <cs2cs>: Sys errno: 2: <system mess. texts unavail.> dummy After: $ cs2cs +proj=latlong +to +proj=latlong dummy <cs2cs>: Sys errno: 2: No such file or directory dummy
-rw-r--r--cmake/ProjConfig.cmake1
-rw-r--r--cmake/proj_config.cmake.in3
-rw-r--r--configure.ac1
-rw-r--r--src/apps/emess.cpp1
4 files changed, 6 insertions, 0 deletions
diff --git a/cmake/ProjConfig.cmake b/cmake/ProjConfig.cmake
index f9593c8d..2243c37d 100644
--- a/cmake/ProjConfig.cmake
+++ b/cmake/ProjConfig.cmake
@@ -25,6 +25,7 @@ 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(strerror HAVE_STRERROR)
# check libm need on unix
check_library_exists(m ceil "" HAVE_LIBM)
diff --git a/cmake/proj_config.cmake.in b/cmake/proj_config.cmake.in
index bbdf3249..caeb0934 100644
--- a/cmake/proj_config.cmake.in
+++ b/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
diff --git a/configure.ac b/configure.ac
index d155432b..a76710d0 100644
--- a/configure.ac
+++ b/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.
diff --git a/src/apps/emess.cpp b/src/apps/emess.cpp
index 144e9e23..52f88aa3 100644
--- a/src/apps/emess.cpp
+++ b/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"