Avoid "echo" in configure.ac in some places

This should avoid some possible incompatibities in the case
of the multi line string argument to "echo", and cleans up
the code by replacing a number of "echo" commands with a
single AC_MSG_WARN.

1 files changed, 15 insertions, 13 deletions

diff --git a/configure.ac b/configure.ac
index eb1ebd81a..7b7bd7f24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -670,14 +670,15 @@ dnl with ac_file set to the filename.
 ])
 AC_OUTPUT
 
-if test "x$CDPATH" != "x"
-then
-        echo
-        echo "***********************************************************"
-        echo "* You have CDPATH set. You may have to run \"unset CDPATH\" *"
-        echo "* before running \"make dist\" or \"make rpm\".               *"
-        echo "***********************************************************"
-fi
+AS_IF([test "x$CDPATH" != "x"], [dnl
+  AC_MSG_WARN([
+
+    #=========================================================#
+    # You have CDPATH set. You may have to run "unset CDPATH" #
+    # before running "make dist" or "make rpm".               #
+    #=========================================================#
+])
+])dnl
 
 GP_CONFIG_OUTPUT
 
@@ -690,11 +691,12 @@ else
    GP_CAMLIBS_WARNING
 fi
 
-echo "Please check whether the configuration I detected matches what you
-would like to have. E.g. make sure that USB support is there if you
-intend to use USB cameras with $PACKAGE_NAME.
+cat<<_GP_EOF
+Please check whether the configuration I have detected matches what
+you would like to have. E.g. make sure that USB support is there if
+you intend to use USB cameras with ${PACKAGE_NAME}.
 
 Please also check that PKG_CONFIG_PATH contains
-    ${pkgconfigdir} 
+    ${pkgconfigdir}
 before compiling any libgphoto2 frontend.
-"
+_GP_EOF