configure.in: use AC_MSG_{RESULT,WARN,ERROR} instead of echo
This gives us standard behavior when using flags such as --quiet, and
gives us standard warning output when showing warnings and errors.
Addresses-Sourceforge-Patches: #2058794
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
diff --git a/configure.in b/configure.in
index c29f438..3b9c53f 100644
--- a/configure.in
+++ b/configure.in
@@ -36,7 +36,7 @@
Oct) MONTH_NUM=10; E2FSPROGS_MONTH="October" ;;
Nov) MONTH_NUM=11; E2FSPROGS_MONTH="November" ;;
Dec) MONTH_NUM=12; E2FSPROGS_MONTH="December" ;;
-*) echo "Unknown month $MONTH??" ;;
+*) AC_MSG_WARN([Unknown month $MONTH??]) ;;
esac
base_ver=`echo $E2FSPROGS_VERSION | \
@@ -54,8 +54,8 @@
esac
unset DATE MONTH YEAR base_ver pre_vers date_spec
-echo "Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION"
-echo "Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}"
+AC_MSG_RESULT([Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION])
+AC_MSG_RESULT([Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}])
AC_SUBST(E2FSPROGS_YEAR)
AC_SUBST(E2FSPROGS_MONTH)
AC_SUBST(E2FSPROGS_DAY)
@@ -161,14 +161,14 @@
if test "$enableval" = "no"
then
MAINTAINER_CMT=#
- echo "Disabling maintainer mode"
+ AC_MSG_RESULT([Disabling maintainer mode])
else
MAINTAINER_CMT=
- echo "Enabling maintainer mode"
+ AC_MSG_RESULT([Enabling maintainer mode])
fi
,
MAINTAINER_CMT=#
-echo "Disabling maintainer mode by default"
+AC_MSG_RESULT([Disabling maintainer mode by default])
)
AC_SUBST(MAINTAINER_CMT)
dnl
@@ -178,14 +178,14 @@
[ --enable-compression enable EXPERIMENTAL compression support],
if test "$enableval" = "no"
then
- echo "Disabling compression support"
+ AC_MSG_RESULT([Disabling compression support])
else
AC_DEFINE(ENABLE_COMPRESSION)
- echo "Enabling compression support"
- echo "WARNING: Compression support is experimental"
+ AC_MSG_RESULT([Enabling compression support])
+ AC_MSG_WARN([Compression support is experimental])
fi
,
-echo "Disabling compression support by default"
+AC_MSG_RESULT([Disabling compression support by default])
)
dnl
dnl handle --enable-htree
@@ -195,16 +195,16 @@
if test "$enableval" = "no"
then
HTREE_CMT=#
- echo "Disabling htree directory support"
+ AC_MSG_RESULT([Disabling htree directory support])
else
HTREE_CMT=
AC_DEFINE(ENABLE_HTREE)
- echo "Enabling htree directory support"
+ AC_MSG_RESULT([Enabling htree directory support])
fi
,
HTREE_CMT=
AC_DEFINE(ENABLE_HTREE)
-echo "Enabling htree directory support by default"
+AC_MSG_RESULT([Enabling htree directory support by default])
)
AC_SUBST(HTREE_CMT)
dnl
@@ -220,7 +220,7 @@
then
ELF_CMT=#
MAKEFILE_ELF=/dev/null
- echo "Disabling ELF shared libraries"
+ AC_MSG_RESULT([Disabling ELF shared libraries])
else
E2_PKG_CONFIG_STATIC=
ELF_CMT=
@@ -232,12 +232,12 @@
esac]
BINARY_TYPE=elfbin
LIB_EXT=.so
- echo "Enabling ELF shared libraries"
+ AC_MSG_RESULT([Enabling ELF shared libraries])
fi
,
MAKEFILE_ELF=/dev/null
ELF_CMT=#
-echo "Disabling ELF shared libraries by default"
+AC_MSG_RESULT([Disabling ELF shared libraries by default])
)
AC_SUBST(ELF_CMT)
AC_SUBST_FILE(MAKEFILE_ELF)
@@ -250,7 +250,7 @@
then
BSDLIB_CMT=#
MAKEFILE_BSDLIB=/dev/null
- echo "Disabling BSD shared libraries"
+ AC_MSG_RESULT([Disabling BSD shared libraries])
else
E2_PKG_CONFIG_STATIC=
BSDLIB_CMT=
@@ -262,12 +262,12 @@
LIB_EXT=.dylib
;;
esac]
- echo "Enabling BSD shared libraries"
+ AC_MSG_RESULT([Enabling BSD shared libraries])
fi
,
MAKEFILE_BSDLIB=/dev/null
BSDLIB_CMT=#
-echo "Disabling BSD shared libraries by default"
+AC_MSG_RESULT([Disabling BSD shared libraries by default])
)
AC_SUBST(BSDLIB_CMT)
AC_SUBST_FILE(MAKEFILE_BSDLIB)
@@ -280,17 +280,17 @@
then
PROFILE_CMT=#
MAKEFILE_PROFILE=/dev/null
- echo "Disabling profiling libraries"
+ AC_MSG_RESULT([Disabling profiling libraries])
else
PROFILE_CMT=
MAKEFILE_PROFILE=$srcdir/lib/Makefile.profile
PROFILED_LIB_EXT=_p.a
- echo "Building profiling libraries"
+ AC_MSG_RESULT([Building profiling libraries])
fi
,
PROFILE_CMT=#
MAKEFILE_PROFILE=/dev/null
-echo "Disabling profiling libraries by default"
+AC_MSG_RESULT([Disabling profiling libraries by default])
)
AC_SUBST(PROFILE_CMT)
AC_SUBST_FILE(MAKEFILE_PROFILE)
@@ -303,16 +303,16 @@
then
CHECKER_CMT=#
MAKEFILE_CHECKER=/dev/null
- echo "Disabling checker libraries"
+ AC_MSG_RESULT([Disabling checker libraries])
else
CHECKER_CMT=
MAKEFILE_CHECKER=$srcdir/lib/Makefile.checker
- echo "Building checker libraries"
+ AC_MSG_RESULT([Building checker libraries])
fi
,
CHECKER_CMT=#
MAKEFILE_CHECKER=/dev/null
-echo "Disabling checker libraries by default"
+AC_MSG_RESULT([Disabling checker libraries by default])
)
AC_SUBST(CHECKER_CMT)
AC_SUBST_FILE(MAKEFILE_CHECKER)
@@ -329,13 +329,13 @@
[ --enable-jbd-debug enable journal debugging],
if test "$enableval" = "no"
then
- echo "Disabling journal debugging"
+ AC_MSG_RESULT([Disabling journal debugging])
else
AC_DEFINE(CONFIG_JBD_DEBUG)
- echo "Enabling journal debugging"
+ AC_MSG_RESULT([Enabling journal debugging])
fi
,
-echo "Disabling journal debugging by default"
+AC_MSG_RESULT([Disabling journal debugging by default])
)
dnl
dnl handle --enable-blkid-debug
@@ -344,13 +344,13 @@
[ --enable-blkid-debug enable blkid debugging],
if test "$enableval" = "no"
then
- echo "Disabling blkid debugging"
+ AC_MSG_RESULT([Disabling blkid debugging])
else
AC_DEFINE(CONFIG_BLKID_DEBUG)
- echo "Enabling blkid debugging"
+ AC_MSG_RESULT([Enabling blkid debugging])
fi
,
-echo "Disabling blkid debugging by default"
+AC_MSG_RESULT([Disabling blkid debugging by default])
)
dnl
dnl handle --enable-testio-debug
@@ -359,13 +359,13 @@
[ --enable-testio-debug enable the use of the test I/O manager for debugging],
if test "$enableval" = "no"
then
- echo "Disabling testio debugging"
+ AC_MSG_RESULT([Disabling testio debugging])
else
AC_DEFINE(CONFIG_TESTIO_DEBUG)
- echo "Enabling testio debugging"
+ AC_MSG_RESULT([Enabling testio debugging])
fi
,
-echo "Disabling testio debugging by default"
+AC_MSG_RESULT([Disabling testio debugging by default])
)
dnl
dnl handle --enable-debugfs
@@ -374,14 +374,14 @@
[ --disable-debugfs disable support of debugfs program],
if test "$enableval" = "no"
then
- echo "Disabling debugfs support"
+ AC_MSG_RESULT([Disabling debugfs support])
DEBUGFS_CMT="#"
else
DEBUGFS_CMT=
- echo "Enabling debugfs support"
+ AC_MSG_RESULT([Enabling debugfs support])
fi
,
-echo "Enabling debugfs support by default"
+AC_MSG_RESULT([Enabling debugfs support by default])
DEBUGFS_CMT=
)
AC_SUBST(DEBUGFS_CMT)
@@ -392,14 +392,14 @@
[ --disable-imager disable support of e2image program],
if test "$enableval" = "no"
then
- echo "Disabling e2image support"
+ AC_MSG_RESULT([Disabling e2image support])
IMAGER_CMT="#"
else
IMAGER_CMT=
- echo "Enabling e2image support"
+ AC_MSG_RESULT([Enabling e2image support])
fi
,
-echo "Enabling e2image support by default"
+AC_MSG_RESULT([Enabling e2image support by default])
IMAGER_CMT=
)
AC_SUBST(IMAGER_CMT)
@@ -410,14 +410,14 @@
[ --disable-resizer disable support of e2resize program],
if test "$enableval" = "no"
then
- echo "Disabling e2resize support"
+ AC_MSG_RESULT([Disabling e2resize support])
RESIZER_CMT="#"
else
RESIZER_CMT=
- echo "Enabling e2resize support"
+ AC_MSG_RESULT([Enabling e2resize support])
fi
,
-echo "Enabling e2resize support by default"
+AC_MSG_RESULT([Enabling e2resize support by default])
RESIZER_CMT=
)
AC_SUBST(RESIZER_CMT)
@@ -429,20 +429,20 @@
[if test "$enableval" = "no"
then
FSCK_PROG='' FSCK_MAN=''
- echo "Not building fsck wrapper"
+ AC_MSG_RESULT([Not building fsck wrapper])
else
FSCK_PROG=fsck FSCK_MAN=fsck.8
- echo "Building fsck wrapper"
+ AC_MSG_RESULT([Building fsck wrapper])
fi]
,
[case "$host_os" in
gnu*)
FSCK_PROG='' FSCK_MAN=''
- echo "Not building fsck wrapper by default"
+ AC_MSG_RESULT([Not building fsck wrapper by default])
;;
*)
FSCK_PROG=fsck FSCK_MAN=fsck.8
- echo "Building fsck wrapper by default"
+ AC_MSG_RESULT([Building fsck wrapper by default])
esac]
)
AC_SUBST(FSCK_PROG)
@@ -455,14 +455,14 @@
[if test "$enableval" = "no"
then
E2INITRD_PROG='' E2INITRD_MAN=''
- echo "Not building e2initrd helper"
+ AC_MSG_RESULT([Not building e2initrd helper])
else
E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
- echo "Building e2initrd helper"
+ AC_MSG_RESULT([Building e2initrd helper])
fi]
,
E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
-echo "Building e2initrd helper by default"
+AC_MSG_RESULT([Building e2initrd helper by default])
)
AC_SUBST(E2INITRD_PROG)
AC_SUBST(E2INITRD_MAN)
@@ -473,19 +473,18 @@
[ --enable-blkid-devmapper build with device-mapper support],
[if test "$enableval" = "no"
then
- echo "Disabling device-mapper support"
+ AC_MSG_RESULT([Disabling device-mapper support])
DEVMAPPER_REQ=''
DEVMAPPER_LIBS=''
STATIC_DEVMAPPER_LIBS=''
else
AC_DEFINE(HAVE_DEVMAPPER)
- echo "Enabling device-mapper support"
+ AC_MSG_RESULT([Enabling device-mapper support])
PKG_PROG_PKG_CONFIG()
if test -z "$PKG_CONFIG"; then
- echo "pkg-config not installed; please install it."
- exit 1;
+ AC_MSG_ERROR([pkg-config not installed; please install it.])
fi
AC_CHECK_LIB(devmapper, dm_tree_create,
@@ -500,7 +499,7 @@
*pthread*)
;;
*)
- echo "Working around Debian bug #390243..."
+ AC_MSG_WARN([Working around Debian bug 390243...])
STATIC_DEVMAPPER_LIBS="-pthread $STATIC_DEVMAPPER_LIBS"
;;
esac
@@ -510,7 +509,7 @@
fi
fi]
,
-echo "Disabling device-mapper support by default"
+AC_MSG_RESULT([Disabling device-mapper support by default])
)
AC_SUBST(DEVMAPPER_REQ)
AC_SUBST(DEVMAPPER_PC_LIBS)
@@ -525,19 +524,19 @@
[if test "$enableval" = "no"
then
try_tls=""
- echo "Disabling thread local support"
+ AC_MSG_RESULT([Disabling thread local support])
else
try_tls="yes"
- echo "Enabling thread local support"
+ AC_MSG_RESULT([Enabling thread local support])
fi]
,
if test -n "$WITH_DIET_LIBC"
then
try_tls=""
- echo "Diet libc does not support thread local support"
+ AC_MSG_RESULT([Diet libc does not support thread local support])
else
try_tls="yes"
- echo "Try using thread local support by default"
+ AC_MSG_RESULT([Try using thread local support by default])
fi
)
if test "$try_tls" = "yes"
@@ -551,17 +550,17 @@
[ --disable-uuidd disable building the uuid daemon],
[if test "$enableval" = "no"
then
- echo "Not building uuidd"
+ AC_MSG_RESULT([Not building uuidd])
UUIDD_CMT="#"
else
AC_DEFINE(USE_UUIDD)
UUIDD_CMT=""
- echo "Building uuidd"
+ AC_MSG_RESULT([Building uuidd])
fi]
,
AC_DEFINE(USE_UUIDD)
UUIDD_CMT=""
-echo "Building uuidd by default"
+AC_MSG_RESULT([Building uuidd by default])
)
AC_SUBST(UUIDD_CMT)
dnl
@@ -812,7 +811,7 @@
linux* | gnu* | k*bsd*-gnu)
if test "$prefix" = NONE -a "$root_prefix" = NONE ; then
root_prefix="";
- echo "On $host_os systems, root_prefix defaults to ''"
+ AC_MSG_RESULT([On $host_os systems, root_prefix defaults to ''])
fi
;;
esac
@@ -823,9 +822,9 @@
linux* | gnu* | k*bsd*-gnu)
if test "$prefix" = NONE ; then
prefix="/usr";
- echo "On $host_os systems, prefix defaults to /usr"
+ AC_MSG_RESULT([On $host_os systems, prefix defaults to /usr])
if test "$mandir" = '${prefix}/man' ; then
- echo "...and mandir defaults to /usr/share/man"
+ AC_MSG_RESULT([...and mandir defaults to /usr/share/man])
mandir=/usr/share/man
fi
fi
@@ -849,19 +848,19 @@
fi
if test "$bindir" != '${exec_prefix}/bin'; then
root_bindir=$bindir
- echo "Setting root_bindir to $root_bindir"
+ AC_MSG_RESULT([Setting root_bindir to $root_bindir])
fi
if test "$sbindir" != '${exec_prefix}/sbin'; then
root_sbindir=$sbindir
- echo "Setting root_sbindir to $root_sbindir"
+ AC_MSG_RESULT([Setting root_sbindir to $root_sbindir])
fi
if test "$libdir" != '${exec_prefix}/lib'; then
root_libdir=$libdir
- echo "Setting root_libdir to $root_libdir"
+ AC_MSG_RESULT([Setting root_libdir to $root_libdir])
fi
if test "$sysconfdir" != '${prefix}/etc'; then
root_sysconfdir=$sysconfdir
- echo "Setting root_sysconfdir to $root_sysconfdir"
+ AC_MSG_RESULT([Setting root_sysconfdir to $root_sysconfdir])
fi
AC_SUBST(root_prefix)
AC_SUBST(root_bindir)
@@ -902,7 +901,7 @@
dnl
case "$host_os" in
darwin*)
- echo "Using Apple Darwin / GNU libintl workaround"
+ AC_MSG_RESULT([Using Apple Darwin / GNU libintl workaround])
AC_DEFINE(_INTL_REDIRECT_MACROS)
;;
esac