Imported Upstream version 0.6.2upstream/0.6.2

1 files changed, 108 insertions, 28 deletions

diff --git a/configure b/configure
index f5b3b10..e702f6c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for htop 0.6.
+# Generated by GNU Autoconf 2.59 for htop 0.6.2.
 #
 # Report bugs to <loderunner@users.sourceforge.net>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='htop'
 PACKAGE_TARNAME='htop'
-PACKAGE_VERSION='0.6'
-PACKAGE_STRING='htop 0.6'
+PACKAGE_VERSION='0.6.2'
+PACKAGE_STRING='htop 0.6.2'
 PACKAGE_BUGREPORT='loderunner@users.sourceforge.net'
 
 ac_unique_file="htop.c"
@@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures htop 0.6 to adapt to many kinds of systems.
+\`configure' configures htop 0.6.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -842,7 +842,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of htop 0.6:";;
+     short | recursive ) echo "Configuration of htop 0.6.2:";;
    esac
   cat <<\_ACEOF
 
@@ -852,6 +852,11 @@ Optional Features:
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-proc=DIR      Location of a Linux-compatible proc filesystem (default=/proc).
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -960,7 +965,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-htop configure 0.6
+htop configure 0.6.2
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -974,7 +979,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by htop $as_me 0.6, which was
+It was created by htop $as_me 0.6.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1609,7 +1614,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='htop'
- VERSION='0.6'
+ VERSION='0.6.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5188,24 +5193,98 @@ fi
 done
 
 
-echo "$as_me:$LINENO: checking for /proc/stat" >&5
-echo $ECHO_N "checking for /proc/stat... $ECHO_C" >&6
-if test "${ac_cv_file__proc_stat+set}" = set; then
+CFLAGS="${CFLAGS} -std=c99"
+echo "$as_me:$LINENO: checking whether gcc -std=c99 option works" >&5
+echo $ECHO_N "checking whether gcc -std=c99 option works... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+char *a; a = strdup("foo"); int i = 0; i++; // C99
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: htop is written in C99. A newer version of gcc is required." >&5
+echo "$as_me: error: htop is written in C99. A newer version of gcc is required." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+PROCDIR=/proc
+
+# Check whether --with-proc or --without-proc was given.
+if test "${with_proc+set}" = set; then
+  withval="$with_proc"
+  if test -n "$withval"; then
+
+cat >>confdefs.h <<_ACEOF
+#define PROCDIR "$withval"
+_ACEOF
+
+      PROCDIR="$withval"
+   fi
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define PROCDIR "/proc"
+_ACEOF
+
+fi;
+
+as_ac_File=`echo "ac_cv_file_$PROCDIR/stat" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $PROCDIR/stat" >&5
+echo $ECHO_N "checking for $PROCDIR/stat... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
-if test -r "/proc/stat"; then
-  ac_cv_file__proc_stat=yes
+if test -r "$PROCDIR/stat"; then
+  eval "$as_ac_File=yes"
 else
-  ac_cv_file__proc_stat=no
+  eval "$as_ac_File=no"
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_file__proc_stat" >&5
-echo "${ECHO_T}$ac_cv_file__proc_stat" >&6
-if test $ac_cv_file__proc_stat = yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
   { { echo "$as_me:$LINENO: error: Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help." >&5
@@ -5213,24 +5292,25 @@ echo "$as_me: error: Cannot find /proc/stat. Make sure you have a Linux-compatib
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:$LINENO: checking for /proc/meminfo" >&5
-echo $ECHO_N "checking for /proc/meminfo... $ECHO_C" >&6
-if test "${ac_cv_file__proc_meminfo+set}" = set; then
+as_ac_File=`echo "ac_cv_file_$PROCDIR/meminfo" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $PROCDIR/meminfo" >&5
+echo $ECHO_N "checking for $PROCDIR/meminfo... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
-if test -r "/proc/meminfo"; then
-  ac_cv_file__proc_meminfo=yes
+if test -r "$PROCDIR/meminfo"; then
+  eval "$as_ac_File=yes"
 else
-  ac_cv_file__proc_meminfo=no
+  eval "$as_ac_File=no"
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_file__proc_meminfo" >&5
-echo "${ECHO_T}$ac_cv_file__proc_meminfo" >&6
-if test $ac_cv_file__proc_meminfo = yes; then
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
   { { echo "$as_me:$LINENO: error: Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help." >&5
@@ -5617,7 +5697,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by htop $as_me 0.6, which was
+This file was extended by htop $as_me 0.6.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5680,7 +5760,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-htop config.status 0.6
+htop config.status 0.6.2
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"