X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=contrib%2Fplatformtest.sh;h=cfa1eccc81ea1a6387f936739d614543bdf379c4;hp=6449a67cdbb5dd6da1342cda88f5a88a828ce910;hb=19d6f4740eb6dc058f02379b0abca96b94eb8159;hpb=10c7a156876f75ab5e21385d2775143dceefe2e9

diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh
index 6449a67c..cfa1eccc 100755
--- a/contrib/platformtest.sh
+++ b/contrib/platformtest.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2010 Alexander Barton <alex@barton.de>
+# Copyright (c)2001-2011 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
@@ -21,13 +21,16 @@ PLATFORM=
 COMPILER="unknown"
 VERSION="unknown"
 DATE=`date "+%y-%m-%d"`
-
-CONFIGURE=
-MAKE=
-CHECK=
-RUN=
 COMMENT=
 
+R_CONFIGURE=
+R_MAKE=
+R_CHECK=
+R_RUN=
+
+[ -n "$MAKE" ] || MAKE="make"
+export MAKE CC
+
 while [ $# -gt 0 ]; do
 	case "$1" in
 		"-v")
@@ -51,8 +54,8 @@ if [ $? -ne 0 ]; then
 	cd ..
 fi
 
-echo "$NAME: Checking for \"./autogen.sh\" script ..."
-if [ -r ./autogen.sh ]; then
+echo "$NAME: Checking for \"./configure\" script ..."
+if [ ! -e ./configure ]; then
 	echo "$NAME: Running \"./autogen.sh\" ..."
 	[ -n "$VERBOSE" ] && ./autogen.sh || ./autogen.sh >/dev/null
 fi
@@ -61,20 +64,20 @@ if [ -r ./configure ]; then
 	echo "$NAME: Running \"./configure\" script ..."
 	[ -n "$VERBOSE" ] && ./configure || ./configure >/dev/null
 	if [ $? -eq 0 -a -r ./Makefile ]; then
-		CONFIGURE=1
-		echo "$NAME: Running \"make\" ..."
-		[ -n "$VERBOSE" ] && make || make >/dev/null
+		R_CONFIGURE=1
+		echo "$NAME: Running \"$MAKE\" ..."
+		[ -n "$VERBOSE" ] && "$MAKE" || "$MAKE" >/dev/null
 		if [ $? -eq 0 -a -x src/ngircd/ngircd ]; then
-			MAKE=1
-			echo "$NAME: Running \"make check\" ..."
-			[ -n "$VERBOSE" ] && make check || make check >/dev/null
+			R_MAKE=1
+			echo "$NAME: Running \"$MAKE check\" ..."
+			[ -n "$VERBOSE" ] && "$MAKE" check || "$MAKE" check >/dev/null
 			if [ $? -eq 0 ]; then
-				CHECK=1
-				RUN=$CHECK
+				R_CHECK=1
+				R_RUN=$R_CHECK
 			else
 				./src/ngircd/ngircd --help 2>/dev/null \
-				 | grep "^ngircd" >/dev/null
-				[ $? -eq 0 ] && RUN=1
+				 | grep "^ngIRCd" >/dev/null
+				[ $? -eq 0 ] && R_RUN=1
 			fi
 		fi
 	fi
@@ -82,9 +85,9 @@ fi
 
 # Get target platform information
 if [ -r "src/config.h" ]; then
-	CPU=`grep "TARGET_CPU" "src/config.h" | cut -d'"' -f2`
-	OS=`grep "TARGET_OS" "src/config.h" | cut -d'"' -f2`
-	VENDOR=`grep "TARGET_VENDOR" "src/config.h" | cut -d'"' -f2`
+	CPU=`grep "HOST_CPU" "src/config.h" | cut -d'"' -f2`
+	OS=`grep "HOST_OS" "src/config.h" | cut -d'"' -f2`
+	VENDOR=`grep "HOST_VENDOR" "src/config.h" | cut -d'"' -f2`
 	PLATFORM="$CPU/$VENDOR/$OS"
 fi
 if [ -z "$PLATFORM" ]; then
@@ -96,9 +99,14 @@ if [ -r "Makefile" ]; then
 	CC=$(grep "^CC = " Makefile | cut -d' ' -f3)
 	$CC --version 2>&1 | grep -i "GCC" >/dev/null
 	if [ $? -eq 0 ]; then
-		COMPILER=$($CC --version | head -1 \
-		  | cut -d')' -f2 | cut -d' ' -f2)
-		COMPILER="gcc $COMPILER"
+		$CC --version 2>&1 | grep -i "Open64" >/dev/null
+		if [ $? -eq 0 ]; then
+			COMPILER="Open64"
+		else
+			COMPILER=$($CC --version | head -1 \
+			  | cut -d')' -f2 | cut -d' ' -f2)
+			COMPILER="gcc $COMPILER"
+		fi
 	else
 		case "$CC" in
 		  gcc*)
@@ -130,10 +138,10 @@ else
 	[ $? -eq 0 ] && COMMENT="(3)"
 fi
 
-[ -n "$CONFIGURE" ] && C="Y" || C="N"
-[ -n "$MAKE" ] && M="Y" || M="N"
-[ -n "$CHECK" ] && T="Y" || T="N"
-[ -n "$RUN" ] && R="Y" || R="N"
+[ -n "$R_CONFIGURE" ] && C="Y" || C="N"
+[ -n "$R_MAKE" ] && M="Y" || M="N"
+[ -n "$R_CHECK" ] && T="Y" || T="N"
+[ -n "$R_RUN" ] && R="Y" || R="N"
 [ -n "$COMMENT" ] && COMMENT=" $COMMENT"
 
 echo