Commit 459a5cda authored by Benjamin Reed's avatar Benjamin Reed

merge 1099510 from 4.4: test for sys/proc_info.h and sys/proc.h

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=1099511
parent 2f3875f7
......@@ -4,6 +4,10 @@ macro_optional_find_package(XKB)
macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)
macro_log_feature(XKB_FOUND "XKB" "X keyboard extension" "http://www.x.org" FALSE "" "Gives Konsole better keyboard support.")
include(CheckIncludeFiles)
check_include_files("sys/proc.h" HAVE_SYS_PROC_H)
check_include_files("sys/proc_info.h" HAVE_SYS_PROC_INFO_H)
configure_file (config-konsole.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-konsole.h )
############### Load the CTest options ###############
......
......@@ -19,6 +19,7 @@
// Own
#include "ProcessInfo.h"
#include "config-konsole.h"
// Unix
#include <sys/socket.h>
......@@ -42,8 +43,12 @@
#if defined(Q_OS_MAC)
#include <sys/sysctl.h>
#ifdef HAVE_SYS_PROC_INFO_H
#include <sys/proc_info.h>
#endif
#ifdef HAVE_SYS_PROC_H
#include <sys/proc.h>
#endif
#include <kde_file.h>
#endif
......
......@@ -7,4 +7,8 @@
/* Defined if your system has XRender support */
#cmakedefine HAVE_XRENDER 1
/* Defined if you have sys/proc.h */
#cmakedefine HAVE_SYS_PROC_H 1
/* Defined if you have sys/proc_info.h */
#cmakedefine HAVE_SYS_PROC_INFO_H 1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment