[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/apps/konsole/src
From:       Benjamin Reed <ranger () befunk ! com>
Date:       2010-03-05 17:56:09
Message-ID: 1267811769.316308.3371.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1099511 by reed:

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

 M  +4 -0      CMakeLists.txt  
 M  +5 -0      ProcessInfo.cpp  
 M  +4 -0      config-konsole.h.cmake  


--- trunk/KDE/kdebase/apps/konsole/src/CMakeLists.txt #1099510:1099511
@@ -4,6 +4,10 @@
 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 ###############
--- trunk/KDE/kdebase/apps/konsole/src/ProcessInfo.cpp #1099510:1099511
@@ -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
 
--- trunk/KDE/kdebase/apps/konsole/src/config-konsole.h.cmake #1099510:1099511
@@ -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


[prev in list] [next in list] [prev in thread] [next in thread]