Complete implementation of --with-proc, making htop more FreeBSD-friendly

3 files changed, 18 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c922fccd..a0aee2e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 
 What's new in version 0.6.1
 
+* Accept --with-proc=<dir> in configure, to specify
+  alternative procfs locations (making htop friendlier
+  to the Linux compatibility layer in FreeBSD)
 * Included icon .desktop and desktop entry
   (thanks to Peter Hyman)
 * Added a check to make sure that a root-user htop closes
diff --git a/ProcessList.c b/ProcessList.c
index 3d87ec00..062cada0 100644
--- a/ProcessList.c
+++ b/ProcessList.c
@@ -5,6 +5,11 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
+#ifndef CONFIG_H
+#define CONFIG_H
+#include "config.h"
+#endif
+
 #include "ProcessList.h"
 #include "Process.h"
 #include "TypedVector.h"
diff --git a/htop.c b/htop.c
index 06009ac9..2e492b3c 100644
--- a/htop.c
+++ b/htop.c
@@ -12,6 +12,11 @@ in the source distribution for its full text.
 #include <ctype.h>
 #include <stdbool.h>
 
+#ifndef CONFIG_H
+#define CONFIG_H
+#include "config.h"
+#endif
+
 #include "ProcessList.h"
 #include "CRT.h"
 #include "ListBox.h"
@@ -26,7 +31,6 @@ in the source distribution for its full text.
 #include "SignalsListBox.h"
 #include "TraceScreen.h"
 
-#include "config.h"
 #include "debug.h"
 
 //#link m
@@ -213,6 +217,11 @@ int main(int argc, char** argv) {
          setUserOnly(argv[2], &userOnly, &userId);
       }
    }
+   
+   if (access(PROCDIR, R_OK) != 0) {
+      fprintf(stderr, "Error: could not read procfs (compiled to look in %s).\n", PROCDIR);
+      exit(1);
+   }
 
    ListBox* lb;
    int quit = 0;