Permalink
Browse files

remove unnecessary verbosity, and move rest to log

  • Loading branch information...
1 parent a3e2ec7 commit 572de92218d4df10890a657ab432b03f48a7f054 @novas0x2a novas0x2a committed Jan 31, 2009
Showing with 19 additions and 34 deletions.
  1. +1 −3 m4/ax_common_options.m4
  2. +2 −0 m4/ax_log.m4
  3. +5 −5 m4/ax_module.m4
  4. +3 −3 m4/ax_module_python.m4
  5. +8 −23 m4/ax_pkg.m4
View
@@ -135,9 +135,7 @@ PKG_PATHS=""
AX_ARG_WITH(pkg-paths, [], [none], [additional search path(s) for packages])
PKG_PATHS="$PKG_PATHS $PKG_PATHS_FROM_FILE $ENABLE_PKG_PATHS_DEFAULT"
-if test "yes" = "$ENABLE_VERBOSE"; then
- AC_MSG_NOTICE([using PKG_PATHS=$PKG_PATHS])
-fi
+AX_LOG([using PKG_PATHS=$PKG_PATHS])
View
@@ -0,0 +1,2 @@
+dnl log something to the config.log
+AC_DEFUN([AX_LOG], [echo "]$1[" >&AS_MESSAGE_LOG_FD])
View
@@ -98,11 +98,11 @@ AC_DEFUN([AX_MODULE],
[$ax_have_pkg_bool],
[Define to 1 if the $1 module is available.])
- if test "$ENABLE_VERBOSE" = "yes" && test "$HAVE_PKG_$1_SRC" = "yes" ; then
- AC_MSG_NOTICE(MAKE_MODULE_$1 = ${MAKE_MODULE_$1})
- AC_MSG_NOTICE(HAVE_PKG_$1 = ${HAVE_PKG_$1})
- AC_MSG_NOTICE(MODULE_$1_LIBS = ${MODULE_$1_LIBS})
- AC_MSG_NOTICE(PKG_$1_LIBS = ${PKG_$1_LIBS})
+ if test "$HAVE_PKG_$1_SRC" = "yes" ; then
+ AX_LOG([MAKE_MODULE_]$1[ = $MAKE_MODULE_]$1)
+ AX_LOG([HAVE_PKG_]$1[ = $HAVE_PKG_]$1)
+ AX_LOG([MODULE_]$1[_LIBS = $MODULE_]$1[_LIBS])
+ AX_LOG([PKG_]$1[_LIBS = $PKG_]$1[_LIBS])
fi
# We're putting these in configure.ac manually by now, for
View
@@ -64,8 +64,8 @@ AC_DEFUN([AX_MODULE_PYTHON],
[$ax_have_pkg_bool],
[Define to 1 if the PYTHON module is available.])
- if test "$ENABLE_VERBOSE" = "yes" && test "$HAVE_PKG_PYTHON_SRC" = "yes" ; then
- AC_MSG_NOTICE(MAKE_MODULE_PYTHON = ${MAKE_MODULE_PYTHON})
- AC_MSG_NOTICE(HAVE_PKG_PYTHON = ${HAVE_PKG_PYTHON})
+ if test "$HAVE_PKG_PYTHON_SRC" = "yes" ; then
+ AX_LOG([MAKE_MODULE_PYTHON = $MAKE_MODULE_PYTHON])
+ AX_LOG([HAVE_PKG_PYTHON = $HAVE_PKG_PYTHON])
fi
])
View
@@ -1,5 +1,3 @@
-AC_DEFUN([AX_LOG], [echo "]$1[" >&AS_MESSAGE_LOG_FD])
-
dnl Usage: AX_PKG(<name>, <dependencies>, <libraries>, <headers>[, <relative include path>, <required-functions>])
AC_DEFUN([AX_PKG],
[
@@ -66,10 +64,6 @@ AC_DEFUN([AX_PKG],
# Otherwise we look for a path that contains the needed headers and libraries
else
- if test "x$ENABLE_VERBOSE" = "yes"; then
- AC_MSG_RESULT([searching...])
- fi
-
if test -n "${HAVE_PKG_$1}" && test "${HAVE_PKG_$1}" != "yes" && test "${HAVE_PKG_$1}" != "no"; then
PKG_PATHS_$1="${HAVE_PKG_$1}"
else
@@ -101,10 +95,6 @@ AC_DEFUN([AX_PKG],
TRY_ADD_CPPFLAGS="$ADD_$1_CPPFLAGS"
TRY_ADD_LDFLAGS="$ADD_$1_LDFLAGS"
- if test x"$ENABLE_VERBOSE" = "xyes"; then
- AC_MSG_CHECKING([for package $1 in $path])
- fi
-
if test "$path" != "default"; then
# ISIS is really stupid, and they use /foo/inc as their include file
# location instead of /foo/include. So we check for that. This sees
@@ -147,9 +137,6 @@ AC_DEFUN([AX_PKG],
TRY_ADD_CPPFLAGS=""
TRY_ADD_LDFLAGS=""
- if test x"$ENABLE_VERBOSE" = "xyes"; then
- AC_MSG_RESULT([no])
- fi
done
# Append to CPPFLAGS, since that's the order we detected in
@@ -165,7 +152,7 @@ AC_DEFUN([AX_PKG],
LDFLAGS="$ax_pkg_old_ldflags"
LIBS="$ax_pkg_old_libs"
- if test "x$HAVE_PKG_$1" = "xno" -a "x$ENABLE_VERBOSE" != "xyes"; then
+ if test "x$HAVE_PKG_$1" = "xno" ; then
AC_MSG_RESULT([no (not found)])
fi
fi
@@ -186,13 +173,11 @@ AC_DEFUN([AX_PKG],
AC_SUBST(PKG_$1_LIBS)
AC_SUBST(HAVE_PKG_$1)
- if test x"$ENABLE_VERBOSE" == "xyes"; then
- AC_MSG_NOTICE([HAVE_PKG_$1 = ${HAVE_PKG_$1}])
- AC_MSG_NOTICE([PKG_$1_CPPFLAGS= $PKG_$1_CPPFLAGS])
- AC_MSG_NOTICE([PKG_$1_LIBS= $PKG_$1_LIBS])
- AC_MSG_NOTICE([CPPFLAGS= $CPPFLAGS])
- AC_MSG_NOTICE([LDFLAGS= $LDFLAGS])
- AC_MSG_NOTICE([OTHER_CPPFLAGS= $OTHER_CPPFLAGS])
- AC_MSG_NOTICE([OTHER_LDFLAGS= $OTHER_LDFLAGS])
- fi
+ AX_LOG([HAVE_PKG_]$1[ = ${HAVE_PKG_]$1[}])
+ AX_LOG([PKG_]$1[_CPPFLAGS= $PKG_]$1[_CPPFLAGS])
+ AX_LOG([PKG_]$1[_LIBS= $PKG_]$1[_LIBS])
+ AX_LOG([CPPFLAGS= $CPPFLAGS])
+ AX_LOG([LDFLAGS= $LDFLAGS])
+ AX_LOG([OTHER_CPPFLAGS= $OTHER_CPPFLAGS])
+ AX_LOG([OTHER_LDFLAGS= $OTHER_LDFLAGS])
])

0 comments on commit 572de92

Please sign in to comment.