$NetBSD: patch-aa,v 1.2 2003/07/31 02:49:53 jschauma Exp $

--- configure.orig	2002-04-07 10:05:48.000000000 -0400
+++ configure	2003-07-30 22:29:10.000000000 -0400
@@ -18,7 +18,7 @@
 # Sun Apr  7 12:04:48 CEST 2002
 
 
-echo='/bin/echo -e'
+echo="${ECHO}"
 
 rm -rf configure-tmp || exit 1;
 mkdir configure-tmp || exit 1;
@@ -29,7 +29,7 @@
 # $CXX
 #
 
-$echo 'Checking C++ compiler... \c';
+$echo -n 'Checking C++ compiler... ';
 cat <<EOF >$tmp_file.C;
 #include <iostream.h>
 int main(int, char **) {
@@ -54,7 +54,7 @@
 # $SYS_POLL_MISSING
 #
 
-$echo 'Checking <sys/poll.h>... \c';
+$echo -n 'Checking <sys/poll.h>... ';
 SYS_POLL_MISSING=unknown;
 cat <<EOF >$tmp_file.C;
 #ifdef SYS_POLL_MISSING /* { */
@@ -94,7 +94,7 @@
 # $SOCKET_LIBRARIES
 #
 
-$echo 'Checking for socket libraries... \c';
+$echo -n 'Checking for socket libraries... ';
 SOCKET_LIBRARIES=unknown;
 cat >$tmp_file.C <<EOF;
 extern "C" int socket();
@@ -125,7 +125,7 @@
 # $BOOL_DEFINITION
 #
 
-$echo 'Checking "bool"... \c';
+$echo -n 'Checking "bool"... ';
 BOOL_DEFINITION=unknown;
 cat <<EOF >$tmp_file.C;
 #ifdef BOOL_DEFINITION
@@ -162,7 +162,7 @@
 # $EXPLICIT
 #
 
-$echo 'Checking "explicit"... \c';
+$echo -n 'Checking "explicit"... ';
 EXPLICIT=unknown;
 cat <<EOF >$tmp_file.C;
 struct C {
@@ -193,7 +193,7 @@
 # $LIBSTDCXX_INCLUDES, $LIBSTDCXX_LIBS
 #
 
-$echo 'Checking Standard C++ library... \c';
+$echo -n 'Checking Standard C++ library... ';
 cat <<EOF >$tmp_file.C;
 #include <string>
 #include <list>
@@ -221,7 +221,7 @@
 # $AUTO_PTR_BROKEN
 #
 AUTO_PTR_BROKEN="";
-$echo 'Checking "auto_ptr"... \c';
+$echo -n 'Checking "auto_ptr"... ';
 cat <<EOF >$tmp_file.C;
 #include <memory>
 #include <string>
@@ -253,7 +253,7 @@
 # $MAKEDEPEND_INCLUDES
 #
 MAKEDEPEND_INCLUDES="";
-$echo 'Checking "makedepend" includes... \c';
+$echo -n 'Checking "makedepend" includes... ';
 echo "#include <iostream.h>" >$tmp_file.C;
 MAKEDEPEND_INCLUDES=`$CXX -E $tmp_file.C 2>/dev/null |
 sed -n \
@@ -286,7 +286,7 @@
   MAKEDEPEND_INCLUDES; \
 do cmd="$cmd -e \"s|@$i@|\$$i|g\""; done;
 for dir in $makedirs; do
-  $echo "Creating \"$dir/Makefile\" from \"$dir/Makefile.in\"... \\c";
+  $echo -n "Creating \"$dir/Makefile\" from \"$dir/Makefile.in\"... ";
   cat <<EOF >$dir/Makefile;
 
 #