From 4e9afd7c2c0b95391b9629d5a03ddc17b67ea833 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Sun, 10 Feb 2013 17:44:03 +0100
Subject: [PATCH] Build fix V2.

---
 configure.ac                  |  2 +-
 lib/base/process.cpp          |  1 +
 third-party/execvpe/execvpe.h | 22 ++++++++++++++++------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 30f9aafe0..437828697 100644
--- 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 0d1d70ee3..1dd6dbdd0 100644
--- 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 c599f11db..00887a383 100644
--- 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__
-extern int execvpe(char *name, char *const argv[], char **envp);
-#endif
-extern void pPrPr_disableITimers (void);
-#endif
+#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
+extern void pPrPr_disableITimers (void);
+#	endif
+
+#	ifdef __cplusplus
+}
+#	endif /* __cplusplus */
+#endif /* HAVE_EXECVPE */