Build fix V2.

diff --git a/configure.ac b/configure.ac
index 30f9aafe007629973a99dda9fd33dfa0feea32d2..43782869795abf10a1267642789a31edf1a71f76 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,7 @@ AC_CHECK_LIB(m, floor)
 AC_CHECK_LIB(socket, getsockname)
 AC_CHECK_LIB(ws2_32, getsockname)
 AC_CHECK_LIB(shlwapi, PathRemoveFileSpecA)
-AC_CHECK_FUNCS([backtrace_symbols])
+AC_CHECK_FUNCS([backtrace_symbols execvpe])
 
 AC_MSG_CHECKING(whether to enable debugging)
 AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes]   turn on debugging (default=no)],, enable_debug=no)

diff --git a/lib/base/process.cpp b/lib/base/process.cpp
index 0d1d70ee34a89884941a6c10323514bb23951a81..1dd6dbdd059b1fd307fda8a51ed3638d54911ad9 100644 (file)
--- a/lib/base/process.cpp
+++ b/lib/base/process.cpp
@@ -18,6 +18,7 @@
  ******************************************************************************/
 
 #include "i2-base.h"
+#include <execvpe.h>
 
 using namespace icinga;
 

diff --git a/third-party/execvpe/execvpe.h b/third-party/execvpe/execvpe.h
index c599f11db1747ccd7e1810261b3a8e637f117af0..00887a3830b2c89236967a398163a5a4857dae88 100644 (file)
--- a/third-party/execvpe/execvpe.h
+++ b/third-party/execvpe/execvpe.h
@@ -4,16 +4,26 @@
    Interface for code in execvpe.c
    ------------------------------------------------------------------------- */
 
+#include <unistd.h>
 #include <errno.h>
 #include <sys/types.h>
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
 
-#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_WIN32)
-#ifndef __QNXNTO__
+#ifndef HAVE_EXECVPE
+#      ifdef __cplusplus
+extern "C" {
+#      endif /* __cplusplus */
+
+#      if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_WIN32)
+#              ifndef __QNXNTO__
 extern int execvpe(char *name, char *const argv[], char **envp);
-#endif
+#      endif
 extern void pPrPr_disableITimers (void);
-#endif
+#      endif
 
+#      ifdef __cplusplus
+}
+#      endif /* __cplusplus */
+#endif /* HAVE_EXECVPE */