[Asterisk-cvs] asterisk Makefile, 1.159, 1.160 ast_expr2.fl, 1.1, 1.2 ast_expr2.y, 1.1, 1.2

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv16604

Modified Files:
	Makefile ast_expr2.fl ast_expr2.y 
Log Message:
fix Solaris compatibility issues (bug #4339)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- Makefile	19 May 2005 15:20:06 -0000	1.159
+++ Makefile	20 May 2005 03:18:35 -0000	1.160
@@ -512,7 +512,7 @@
 		if [ -f patches/.applied ]; then \
 			patches=`cat patches/.applied`; \
 		fi; \
-		if ! [ -z "$$patches" ]; then \
+		if [ ! -z "$$patches" ]; then \
 			for x in $$patches; do \
 				echo "Unapplying $$x..."; \
 				patch -R -p0 < patches/$$x; \
@@ -527,7 +527,7 @@
 			grep ^C update.out | cut -d' ' -f2- ; \
 		fi ; \
 		rm -f update.out; \
-		if ! [ -z "$$patches" ]; then \
+		if [ ! -z "$$patches" ]; then \
 			for x in $$patches; do \
 				if [ -f patches/$$x ]; then \
 					echo "Applying patch $$x..."; \
@@ -638,7 +638,7 @@
 adsi: all
 	mkdir -p $(DESTDIR)$(ASTETCDIR)
 	for x in configs/*.adsi; do \
-		if ! [ -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
+		if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
 			install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
 		fi ; \
 	done
@@ -806,7 +806,7 @@
 # We can avoid this by making noclean
 
 cleantest:
-	if ! cmp -s .cleancount .lastclean ; then \
+	if cmp -s .cleancount .lastclean ; then echo ; else \
 		$(MAKE) clean; cp -f .cleancount .lastclean;\
 	fi
 
@@ -840,7 +840,7 @@
 unapply: 
 	@if [ -z "$(PATCH)" ]; then \
 		echo "Usage: make PATCH=<patchname> unapply"; \
-	elif ! grep -q ^$(PATCH)$$ patches/.applied 2>/dev/null; then \
+	elif grep -v -q ^$(PATCH)$$ patches/.applied 2>/dev/null; then \
 		echo "Patch $(PATCH) is not applied"; \
 	elif [ -f "patches/$(PATCH)" ]; then \
 		echo "Un-applying patch $(PATCH)"; \

Index: ast_expr2.fl
===================================================================
RCS file: /usr/cvsroot/asterisk/ast_expr2.fl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ast_expr2.fl	16 May 2005 00:35:38 -0000	1.1
+++ ast_expr2.fl	20 May 2005 03:18:35 -0000	1.2
@@ -5,7 +5,11 @@
 #include <string.h>
 #include <locale.h>
 #include <ctype.h>
+#ifndef SOLARIS
 #include <err.h>
+#else
+#define quad_t uint64_t
+#endif
 #include <errno.h>
 #include <regex.h>
 #include <limits.h>

Index: ast_expr2.y
===================================================================
RCS file: /usr/cvsroot/asterisk/ast_expr2.y,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ast_expr2.y	16 May 2005 00:35:38 -0000	1.1
+++ ast_expr2.y	20 May 2005 03:18:35 -0000	1.2
@@ -18,7 +18,11 @@
 #include <string.h>
 #include <locale.h>
 #include <ctype.h>
+#ifndef SOLARIS
 #include <err.h>
+#else
+#define quad_t uint64_t
+#endif
 #include <errno.h>
 #include <regex.h>
 #include <limits.h>