X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=contrib%2Fplatformtest.sh;h=76f4169c70843ffb0ba88b5effe94101bd949545;hb=6685ae063f4e7dd75346cf50cff84c8c109e2d6b;hp=6b154bbb826c3b71206c41a471814fadf552109b;hpb=a2479bb9069ea2b61cf606dbefc2cb3ad0eb8e1d;p=ngircd-alex.git

diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh
index 6b154bbb..76f4169c 100755
--- a/contrib/platformtest.sh
+++ b/contrib/platformtest.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors
+# Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -65,7 +65,7 @@ if [ -d .git ]; then
 fi
 
 echo "$NAME: Checking for \"./configure\" script ..."
-if [ ! -e ./configure ]; then
+if [ ! -r ./configure ]; then
 	echo "$NAME: Running \"./autogen.sh\" ..."
 	[ -n "$VERBOSE" ] && ./autogen.sh || ./autogen.sh >/dev/null
 fi
@@ -120,11 +120,12 @@ if [ -r "Makefile" ]; then
 		fi
 	else
 		# Non-GCC compiler
-		$CC --version 2>&1 | grep -i "LLVM" >/dev/null
+		$CC --version 2>&1 | grep -i "clang" >/dev/null
 		if [ $? -eq 0 ]; then
 			COMPILER=$($CC --version 2>/dev/null | head -1 \
-			  | cut -d'(' -f1 | sed -e 's/version //g' \
-			  | sed -e 's/Apple /A-/g')
+			  | cut -d'(' -f1 | cut -d'-' -f1 \
+			  | sed -e 's/version //g' | sed -e 's/Apple /A-/g' \
+			  | sed -e 's/Debian //g' | sed -e 's/LLVM /clang /g')
 		fi
 		$CC -version 2>&1 | grep -i "tcc" >/dev/null
 		if [ $? -eq 0 ]; then
@@ -150,14 +151,14 @@ esac
 
 # Get IO interface information
 if [ "$OS" = "linux-gnu" ]; then
-	COMMENT="(1)"
+	COMMENT="1"
 else
 	grep "^#define HAVE_SYS_DEVPOLL_H 1" src/config.h >/dev/null 2>&1
-	[ $? -eq 0 ] && COMMENT="(4)"
+	[ $? -eq 0 ] && COMMENT="4"
 	grep "^#define HAVE_EPOLL_CREATE 1" src/config.h >/dev/null 2>&1
-	[ $? -eq 0 ] && COMMENT="(5)"
+	[ $? -eq 0 ] && COMMENT="5"
 	grep "^#define HAVE_KQUEUE 1" src/config.h >/dev/null 2>&1
-	[ $? -eq 0 ] && COMMENT="(3)"
+	[ $? -eq 0 ] && COMMENT="3"
 fi
 
 [ -n "$R_CONFIGURE" ] && C="Y" || C="N"
@@ -167,16 +168,16 @@ fi
 [ -n "$COMMENT" ] && COMMENT=" $COMMENT"
 
 echo
-echo "                              the executable works (\"runs\") as expected --+"
-echo "                                tests run successfully (\"make check\") --+ |"
-echo "                                           ngIRCd compiles (\"make\") --+ | |"
-echo "                                                ./configure works --+ | | |"
-echo "                                                                    | | | |"
-echo "Platform                    Compiler     ngIRCd     Date     Tester C M T R See"
-echo "--------------------------- ------------ ---------- -------- ------ - - - - ---"
+echo "                                the executable works (\"runs\") as expected --+"
+echo "                                  tests run successfully (\"make check\") --+ |"
+echo "                                             ngIRCd compiles (\"make\") --+ | |"
+echo "                                                  ./configure works --+ | | |"
+echo "                                                                      | | | |"
+echo "Platform                    Compiler     ngIRCd     Date     Tester   C M T R *"
+echo "--------------------------- ------------ ---------- -------- -------- - - - - -"
 type printf >/dev/null 2>&1
 if [ $? -eq 0 ]; then
-	printf "%-27s %-12s %-10s %s %-6s %s %s %s %s%s" \
+	printf "%-27s %-12s %-10s %s %-8s %s %s %s %s%s" \
 	 "$PLATFORM" "$COMPILER" "$VERSION" "$DATE" "$USER" \
 	 "$C" "$M" "$T" "$R" "$COMMENT"
 else