tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fix V2.

This commit is contained in:
Gunnar Beutner 2013-02-10 17:44:03 +01:00
parent 8667bba7e0
commit 4e9afd7c2c
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -70,7 +70,7 @@ AC_CHECK_LIB(m, floor)
AC_CHECK_LIB(socket, getsockname) AC_CHECK_LIB(socket, getsockname)
AC_CHECK_LIB(ws2_32, getsockname) AC_CHECK_LIB(ws2_32, getsockname)
AC_CHECK_LIB(shlwapi, PathRemoveFileSpecA) AC_CHECK_LIB(shlwapi, PathRemoveFileSpecA)
AC_CHECK_FUNCS([backtrace_symbols]) AC_CHECK_FUNCS([backtrace_symbols execvpe])
AC_MSG_CHECKING(whether to enable debugging) AC_MSG_CHECKING(whether to enable debugging)
AC_ARG_ENABLE(debug, [ --enable-debug=[no/yes] turn on debugging (default=no)],, enable_debug=no) AC_ARG_ENABLE(debug, [ --enable-debug=[no/yes] turn on debugging (default=no)],, enable_debug=no)

1
lib/base/process.cpp
View File

@ -18,6 +18,7 @@
******************************************************************************/ ******************************************************************************/
#include "i2-base.h" #include "i2-base.h"
#include <execvpe.h>
using namespace icinga; using namespace icinga;

22
third-party/execvpe/execvpe.h vendored
View File

@ -4,16 +4,26 @@
Interface for code in execvpe.c Interface for code in execvpe.c
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
#include <unistd.h>
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#if HAVE_SYS_WAIT_H #if HAVE_SYS_WAIT_H
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif
#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_WIN32) #ifndef HAVE_EXECVPE
#ifndef __QNXNTO__ # ifdef __cplusplus
extern int execvpe(char *name, char *const argv[], char **envp); extern "C" {
#endif # endif /* __cplusplus */
extern void pPrPr_disableITimers (void);
#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
# ifdef __cplusplus
}
# endif /* __cplusplus */
#endif /* HAVE_EXECVPE */