nginx-0.0.2-2004-02-03-23:27:11 import
diff --git a/auto/fmt/fmt b/auto/fmt/fmt
index 13b9bd3..f1c9c59 100644
--- a/auto/fmt/fmt
+++ b/auto/fmt/fmt
@@ -1,5 +1,5 @@
-echo -n "checking for $ngx_type printf() format ..."
+echo $ngx_n "checking for $ngx_type printf() format ..." $ngx_c
echo >> $NGX_ERR
echo "checking for $ngx_type printf() format" >> $NGX_ERR
@@ -33,9 +33,9 @@
if [ -x $NGX_AUTOTEST ]; then
if [ "`$NGX_AUTOTEST`" = $max_size ]; then
if [ $ngx_fmt_collect = yes ]; then
- echo -n "$comma \"${fmt}\" is appropriate"
+ echo $ngx_n "$comma \"${fmt}\" is appropriate" $ngx_c
else
- echo -n "$comma \"${fmt}\" used"
+ echo $ngx_n "$comma \"${fmt}\" used" $ngx_c
fi
ngx_fmt=$fmt
fi
@@ -53,7 +53,7 @@
fi
fi
- echo -n "$comma \"${fmt}\" is not appropriate"
+ echo $ngx_n "$comma \"${fmt}\" is not appropriate" $ngx_c
comma=","
done
diff --git a/auto/func b/auto/func
index 6035ef7..37b2bff 100644
--- a/auto/func
+++ b/auto/func
@@ -1,5 +1,5 @@
-echo -n "checking for $ngx_func ..."
+echo $ngx_n "checking for $ngx_func ..." $ngx_c
echo >> $NGX_ERR
echo "checking for $ngx_func" >> $NGX_ERR
diff --git a/auto/inc b/auto/inc
index 2f3a68e..fc71a11 100644
--- a/auto/inc
+++ b/auto/inc
@@ -1,5 +1,5 @@
-echo -n "checking for $ngx_inc ..."
+echo $ngx_n "checking for $ngx_inc ..." $ngx_c
echo >> $NGX_ERR
echo "checking for $ngx_inc" >> $NGX_ERR
diff --git a/auto/init b/auto/init
index bc82034..50971dd 100644
--- a/auto/init
+++ b/auto/init
@@ -6,3 +6,20 @@
NGX_AUTOTEST=$OBJS/autotest
NGX_ERR=$OBJS/autoconf.err
+
+
+# checking echo's "-n" option and "\c" capabilties
+
+if echo "test\c" | grep c >/dev/null; then
+ if echo -n test | grep n >/dev/null; then
+ ngx_n=
+ ngx_c=
+ else
+ ngx_n=-n
+ ngx_c=
+ fi
+
+else
+ ngx_n=
+ ngx_c='\c'
+fi
diff --git a/auto/types/sizeof b/auto/types/sizeof
index 4baf3d7..ebb0fa9 100644
--- a/auto/types/sizeof
+++ b/auto/types/sizeof
@@ -1,5 +1,5 @@
-echo -n "checking for $ngx_type size ..."
+echo $ngx_n "checking for $ngx_type size ..." $ngx_c
echo >> $NGX_ERR
echo "checking for $ngx_type size" >> $NGX_ERR
diff --git a/auto/types/typedef b/auto/types/typedef
index d093e01..3fc20d8 100644
--- a/auto/types/typedef
+++ b/auto/types/typedef
@@ -1,5 +1,5 @@
-echo -n "checking for $ngx_type ..."
+echo $ngx_n "checking for $ngx_type ..." $ngx_c
echo >> $NGX_ERR
echo "checking for $ngx_type" >> $NGX_ERR
@@ -39,7 +39,7 @@
rm $NGX_AUTOTEST*
if [ $found = no ]; then
- echo -n " $type not found"
+ echo $ngx_n " $type not found" $ngx_c
else
break
fi
diff --git a/auto/types/uintptr_t b/auto/types/uintptr_t
index eb375b0..f46ffb6 100644
--- a/auto/types/uintptr_t
+++ b/auto/types/uintptr_t
@@ -1,5 +1,5 @@
-echo -n "checking for uintptr_t ... "
+echo $ngx_n "checking for uintptr_t ... " $ngx_c
echo >> $NGX_ERR
echo "checking for uintptr_t" >> $NGX_ERR
@@ -23,7 +23,7 @@
echo " uintptr_t found"
found=yes
else
- echo -n " uintptr_t not found"
+ echo $ngx_n " uintptr_t not found" $ngx_c
fi
rm $NGX_AUTOTEST*
