Merge branch 'upstream'

Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>

Conflicts:
	jmake/jmake.man

1 files changed, 16 insertions, 14 deletions

diff --git a/mcon/U/d_siglist.U b/mcon/U/d_siglist.U
index ded1311..ab15388 100644
--- a/mcon/U/d_siglist.U
+++ b/mcon/U/d_siglist.U
@@ -1,18 +1,18 @@
-?RCS: $Id: d_siglist.U 1 2006-08-24 12:32:52Z rmanfredi $
+?RCS: $Id: d_siglist.U 167 2013-05-08 17:58:00Z rmanfredi $
 ?RCS:
 ?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
 ?RCS: 
-?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: You may redistribute only under the terms of the Artistic License,
 ?RCS: as specified in the README file that comes with the distribution.
 ?RCS: You may reuse parts of this distribution only within the terms of
-?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: that same Artistic License; a copy of which may be found at the root
 ?RCS: of the source tree for dist 4.0.
 ?RCS:
 ?RCS: $Log: d_siglist.U,v $
 ?RCS: Revision 3.0  1993/08/18  12:07:22  ram
 ?RCS: Baseline for dist 3.0 netwide release.
 ?RCS:
-?MAKE:d_siglist: Csym Setvar
+?MAKE:d_siglist: Trylink cat
 ?MAKE:	-pick add $@ %<
 ?S:d_siglist:
 ?S:	This variable conditionally defines HAS_SYS_SIGLIST if sys_siglist[] is
@@ -25,15 +25,17 @@
 ?H:#$d_siglist HAS_SYS_SIGLIST		/**/
 ?H:.
 ?LINT:set d_siglist
-: see if sys_siglist[] exist
-echo " "
-if set sys_siglist val -a d_siglist; eval $csym; $val; then	
-	echo "You have sys_siglist[] for signal description." >&4
-	val="$define"
-else
-	echo "You don't have sys_siglist[]." >&4
-	val="$undef"
-fi
+: see if sys_siglist[] exists
+$cat >try.c <<EOC
+#include <signal.h>
+int main(void)
+{
+	static char c;
+	c |= *sys_siglist[0];
+	return c ? 0 : 1
+}
+EOC
+cyn="whether sys_siglist[] exists"
 set d_siglist
-eval $setvar
+eval $trylink