coverity 10048

[oweals/gnunet.git] / contrib / report.sh

diff --git a/contrib/report.sh b/contrib/report.sh
index 521226c9461a97df5077acc0d3cbc38fa6fe1338..37a1c41ad0931454cf69e263c264db4d6d4f18e5 100755 (executable)
--- a/contrib/report.sh
+++ b/contrib/report.sh
@@ -7,8 +7,6 @@ else
   WHICH=type
 fi
 
-echo "On some systems, you may need to change /bin/sh to point to bash"
-echo
 echo "Please submit the following information with your bug report: "
 echo "--------------------------------------------------------------"
 OS=`uname -s 2>/dev/null`
@@ -83,12 +81,19 @@ else
   echo "libextractor   : Not Found"
 fi
 
-TEST=`$WHICH gnunetd 2>/dev/null`
-if test -n "$TEST"; then
+if test -x gnunetd; then
   gnunetd -v | sed -e "s/v//" 2>/dev/null |\
-    awk '{print "GNUnet         : "$2}'
+    awk '{print "GNUnet 0.8     : "$2 (may conflict!)}'
+else
+  echo "GNUnet 0.8     : Not Found (good)"
+fi
+
+TEST=`$WHICH gnunet-arm 2>/dev/null`
+if test -n "$TEST"; then
+  gnunet-arm -v | sed -e "s/v//" 2>/dev/null |\
+    awk '{print "GNUnet 0.9     : "$2}'
 else
-  echo "GNUnet         : Not Found"
+  echo "GNUnet 0.9     : Not Found"
 fi
 
 TEST=`$WHICH libgcrypt-config 2> /dev/null`
@@ -169,13 +174,6 @@ else
 fi
 
 
-TEST=`grep "Id:" /usr/include/adns.h 2> /dev/null`
-if test -n "$TEST"; then
-  echo "$TEST" | awk '{print "GNU adns       : "$4}'
-else
-  echo "GNU adns       : Not found"
-fi
-
 TEST=`which qmake 2> /dev/null`
 if test -x "$TEST"; then
   qmake --version | tail -n 1 | awk '{print "Qt             : "$4}'
@@ -183,9 +181,20 @@ else
   echo "Qt             : Not found"
 fi
 
-
-
-
+echo -n "MHD            : "
+TMPFILE=`mktemp /tmp/mhd-version-testXXXXXX`
+cat - >$TMPFILE.c <<EOF
+#include <microhttpd.h>
+#include <stdio.h>
+int main()
+{
+  fprintf (stdout, "%X\n", MHD_VERSION);
+  return 0;
+}
+EOF
+
+gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
+rm -f $TMPFILE $TMPFILE.bin
 
 
 echo "--------------------------------------------------------------"