[Asterisk-cvs] asterisk/editline Makefile.in, 1.5, 1.6 configure, 1.3, 1.4 configure.in, 1.3, 1.4

kpfleming kpfleming
Tue Oct 4 20:22:10 CDT 2005


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

Modified Files:
	Makefile.in configure configure.in 
Log Message:
correct cygwin detection (issue #5328)
handle parallel make better (issue #5328)


Index: Makefile.in
===================================================================
RCS file: /usr/cvsroot/asterisk/editline/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.in	5 Jul 2005 19:30:18 -0000	1.5
+++ Makefile.in	5 Oct 2005 00:17:57 -0000	1.6
@@ -3,9 +3,8 @@
 #
 
 OSTYPE=$(shell uname -s)
-cygx="$(shell uname -s | sed -e c\cygwin | tr [:upper:] [:lower:])"
 define cyg_subst_sys
-	if [ $(cygx) = "cygwin" ]; then \
+	if uname -s | grep -qi cygwin; then \
 	cat $@ | sed -e s/"sys\.h"/"config.h"/g > $@.copy; \
 	mv --force $@.copy $@; \
 	fi
@@ -230,3 +229,5 @@
 
 .c.o_s : $(AGHDRS) $(BGHDRS)
 	$(CC) -c $(S_CFLAGS) $(CFLAGS) $(CPPFLAGS) $< -o $@
+
+$(CCSRCS) : $(BGHDRS)

Index: configure
===================================================================
RCS file: /usr/cvsroot/asterisk/editline/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure	5 Jul 2005 19:30:18 -0000	1.3
+++ configure	5 Oct 2005 00:17:57 -0000	1.4
@@ -895,8 +895,7 @@
 	ABI="elf"
 	;;
   *-*-linux* | *cygwin*)
-	cyg="$(echo ${host} | sed -e c\cygwin)"
-	if [ ${cyg} = cygwin ]; then \
+	if echo ${host} | grep -q cygwin ; then \
 		echo "cygwin detected"; \
 		S_CFLAGS=""; \
 		echo "/* cygdef.h. Generated automatically by configure. */ 

Index: configure.in
===================================================================
RCS file: /usr/cvsroot/asterisk/editline/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.in	5 Jul 2005 19:30:18 -0000	1.3
+++ configure.in	5 Oct 2005 00:17:57 -0000	1.4
@@ -32,8 +32,7 @@
 	ABI="elf"
 	;;
   *-*-linux* | *cygwin*)
-	cyg="$(echo ${host} | sed -e c\cygwin)"
-	if [ ${cyg} = cygwin ]; then \
+	if echo ${host} | grep -q cygwin ; then \
 		echo "cygwin detected"; \
 		S_CFLAGS=""; \
 		echo "/* cygdef.h. Generated automatically by configure. */ 




More information about the svn-commits mailing list