correct cygwin detection (issue #5328)

handle parallel make better (issue #5328)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6725 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 5 insertions, 6 deletions

diff --git a/editline/Makefile.in b/editline/Makefile.in
index c4e569515..805642281 100755
--- a/editline/Makefile.in
+++ b/editline/Makefile.in
@@ -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 @@ editline.c : $(ACSRCS) $(BCSRCS) $(AGCSRCS)
 
 .c.o_s : $(AGHDRS) $(BGHDRS)
 	$(CC) -c $(S_CFLAGS) $(CFLAGS) $(CPPFLAGS) $< -o $@
+
+$(CCSRCS) : $(BGHDRS)
diff --git a/editline/configure b/editline/configure
index 9dccffd0f..7265fe020 100755
--- a/editline/configure
+++ b/editline/configure
@@ -895,8 +895,7 @@ case "${host}" in
 	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. */ 
diff --git a/editline/configure.in b/editline/configure.in
index dcef07a91..2e37d6b2a 100755
--- a/editline/configure.in
+++ b/editline/configure.in
@@ -32,8 +32,7 @@ case "${host}" in
 	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. */