X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=contrib%2Freport.sh;h=6e1d399490272a5f26050e3a085740643b2f1167;hb=1cc4422321ddec369d7ff8843ca4fbec8d61e68f;hp=76abe5a7c6fbc016a75d0a5e96ca53767661c704;hpb=0a217a8df1657b4334b55b0e4a6c7837a8dbcfd9;p=oweals%2Fgnunet.git

diff --git a/contrib/report.sh b/contrib/report.sh
index 76abe5a7c..6e1d39949 100755
--- 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`
@@ -151,21 +156,32 @@ else
   fi
 fi
 
-TEST=`$WHICH gettext 2> /dev/null`
+TEST=`$WHICH dpkg 2> /dev/null`
 if test -n "$TEST"; then
-  gettext --version | head -n1 2> /dev/null | \
-    awk '{print "GNU gettext    : "$4}'
+  LINES=`dpkg -s libunistring-dev | grep Version | wc -l`
+  if test "$LINES" = "1"
+  then
+    VERSION=`dpkg -s libunistring-dev | grep Version | awk '{print $2}'`
+    echo "libunistring   : libunistring3-dev-$VERSION.deb"
+  else
+    echo "libunistring   : dpkg: libunistring3-dev not installed"
+  fi
 else
-  echo "GNU gettext    : Not found"
+  TEST=`$WHICH rpm 2> /dev/null`
+  if test -n "$TEST"; then
+    rpm -q unistring | sed -e "s/unistring-//" 2> /dev/null | \
+      awk '{print "libunistring   : "$1.rpm}'
+  else
+    echo "libunistring   : Test not available"
+  fi
 fi
 
-
-TEST=`$WHICH guile 2> /dev/null`
+TEST=`$WHICH gettext 2> /dev/null`
 if test -n "$TEST"; then
-  guile --version | head -n1 2> /dev/null | \
-    awk '{print "Guile          : "$2}'
+  gettext --version | head -n1 2> /dev/null | \
+    awk '{print "GNU gettext    : "$4}'
 else
-  echo "Guile          : Not found"
+  echo "GNU gettext    : Not found"
 fi
 
 
@@ -177,24 +193,52 @@ else
   echo "libcurl        : Not found"
 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}'
-else
-  echo "Qt             : Not found"
-fi
-
-
-
-
+echo -n "libmicrohttpd  : "
+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 -n "GNU GLPK       : "
+TMPFILE=`mktemp /tmp/glpk-version-testXXXXXX`
+cat - >$TMPFILE.c <<EOF
+#include <glpk.h>
+#include <stdio.h>
+int main()
+{
+  fprintf (stdout, "%u.%u\n", GLP_MAJOR_VERSION, GLP_MINOR_VERSION);
+  return 0;
+}
+EOF
+
+gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
+rm -f $TMPFILE $TMPFILE.bin
+
+
+echo -n "GNUtls         : "
+TMPFILE=`mktemp /tmp/gnutls-version-testXXXXXX`
+cat - >$TMPFILE.c <<EOF
+#include <gnutls/gnutls.h>
+#include <stdio.h>
+int main()
+{
+  fprintf (stdout, "%s\n", GNUTLS_VERSION);
+  return 0;
+}
+EOF
+
+gcc -o $TMPFILE $TMPFILE.c 2> /dev/null && $TMPFILE || echo "Not found"
+rm -f $TMPFILE $TMPFILE.bin
 
 
 echo "--------------------------------------------------------------"