[svn-commits] russell: trunk r1297 - in /trunk: acinclude.m4
configure configure.ac
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sun Aug 13 16:46:10 MST 2006
Author: russell
Date: Sun Aug 13 18:46:10 2006
New Revision: 1297
URL: http://svn.digium.com/view/zaptel?rev=1297&view=rev
Log:
use AC_MSG_* instead of echo to support ./configure --silent (issue #7722)
Modified:
trunk/acinclude.m4
trunk/configure
trunk/configure.ac
Modified: trunk/acinclude.m4
URL: http://svn.digium.com/view/zaptel/trunk/acinclude.m4?rev=1297&r1=1296&r2=1297&view=diff
==============================================================================
--- trunk/acinclude.m4 (original)
+++ trunk/acinclude.m4 Sun Aug 13 18:46:10 2006
@@ -43,10 +43,10 @@
if test "x${$4_HEADER_FOUND}" = "x0" ; then
if test ! -z "${$4_MANDATORY}" ;
then
- echo " ***"
- echo " *** It appears that you do not have the $1 development package installed."
- echo " *** Please install it to include $5 support, or re-run configure"
- echo " *** without explicitly specifying --with-$1"
+ AC_MSG_NOTICE(***)
+ AC_MSG_NOTICE(*** It appears that you do not have the $1 development package installed.)
+ AC_MSG_NOTICE(*** Please install it to include $5 support, or re-run configure)
+ AC_MSG_NOTICE(*** without explicitly specifying --with-$1)
exit 1
fi
$4_LIB=""
@@ -58,10 +58,10 @@
fi
elif test ! -z "${$4_MANDATORY}";
then
- echo "***"
- echo "*** The $5 installation on this system appears to be broken."
- echo "*** Either correct the installation, or run configure"
- echo "*** without explicity specifying --with-$1"
+ AC_MSG_NOTICE(***)
+ AC_MSG_NOTICE(*** The $5 installation on this system appears to be broken.)
+ AC_MSG_NOTICE(*** Either correct the installation, or run configure)
+ AC_MSG_NOTICE(*** without explicity specifying --with-$1)
exit 1
fi
fi
@@ -83,8 +83,7 @@
done ;
) ;
if test "x$GNU_MAKE" = "xNot Found" ; then
- echo " *** Please install GNU make. It is required to build Asterisk!"
- exit 1
+ AC_MSG_ERROR(*** Please install GNU make. It is required to build Asterisk!)
fi
AC_SUBST([GNU_MAKE])
])
Modified: trunk/configure
URL: http://svn.digium.com/view/zaptel/trunk/configure?rev=1297&r1=1296&r2=1297&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sun Aug 13 18:46:10 2006
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac Revision: 1147 .
+# From configure.ac Revision: 1179 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59e.
+# Generated by GNU Autoconf 2.60.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -233,8 +233,8 @@
for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells which exist, to save several forks.
- if test -f "$as_shell" &&
+ # Try only shells that exist, to save several forks.
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
{ ("$as_shell") 2> /dev/null <<\_ASEOF
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -1320,7 +1320,7 @@
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.59e
+generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1336,7 +1336,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.59e. Invocation command line was
+generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -1684,9 +1684,6 @@
# check existence of the package
-# specify output header file
-# AC_CONFIG_HEADER(autoconfig.h)
-
@@ -1709,15 +1706,6 @@
_ACEOF
-
-#AH_TOP(
-#ifndef ZAPTEL_AUTOCONFIG_H
-#define ZAPTEL_AUTOCONFIG_H
-#)
-
-#AH_BOTTOM(
-#endif
-#)
# Checks for programs.
ac_ext=c
@@ -2370,7 +2358,7 @@
ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -2556,13 +2544,13 @@
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
@@ -2627,6 +2615,11 @@
that's true only with -std. */
int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -2687,7 +2680,7 @@
fi
-rm -f conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
rm -f conftest.$ac_ext
@@ -3113,8 +3106,9 @@
{ echo "$as_me:$LINENO: result: $GNU_MAKE" >&5
echo "${ECHO_T}$GNU_MAKE" >&6; } ;
if test "x$GNU_MAKE" = "xNot Found" ; then
- echo " *** Please install GNU make. It is required to build Asterisk!"
- exit 1
+ { { echo "$as_me:$LINENO: error: *** Please install GNU make. It is required to build Asterisk!" >&5
+echo "$as_me: error: *** Please install GNU make. It is required to build Asterisk!" >&2;}
+ { (exit 1); exit 1; }; }
fi
@@ -3480,7 +3474,7 @@
ac_cv_header_stdc=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -3676,7 +3670,7 @@
eval "$as_ac_Header=no"
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_Header'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -3790,7 +3784,7 @@
ac_cv_lib_curses_initscr=no
fi
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -3875,7 +3869,7 @@
ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -4035,7 +4029,7 @@
ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -4133,10 +4127,14 @@
if test "x${CURSES_HEADER_FOUND}" = "x0" ; then
if test ! -z "${CURSES_MANDATORY}" ;
then
- echo " ***"
- echo " *** It appears that you do not have the curses development package installed."
- echo " *** Please install it to include curses support, or re-run configure"
- echo " *** without explicitly specifying --with-curses"
+ { echo "$as_me:$LINENO: ***" >&5
+echo "$as_me: ***" >&6;}
+ { echo "$as_me:$LINENO: *** It appears that you do not have the curses development package installed." >&5
+echo "$as_me: *** It appears that you do not have the curses development package installed." >&6;}
+ { echo "$as_me:$LINENO: *** Please install it to include curses support" >&5
+echo "$as_me: *** Please install it to include curses support" >&or re-run configure;}
+ { echo "$as_me:$LINENO: *** without explicitly specifying --with-curses" >&5
+echo "$as_me: *** without explicitly specifying --with-curses" >&6;}
exit 1
fi
CURSES_LIB=""
@@ -4152,10 +4150,14 @@
fi
elif test ! -z "${CURSES_MANDATORY}";
then
- echo "***"
- echo "*** The curses installation on this system appears to be broken."
- echo "*** Either correct the installation, or run configure"
- echo "*** without explicity specifying --with-curses"
+ { echo "$as_me:$LINENO: ***" >&5
+echo "$as_me: ***" >&6;}
+ { echo "$as_me:$LINENO: *** The curses installation on this system appears to be broken." >&5
+echo "$as_me: *** The curses installation on this system appears to be broken." >&6;}
+ { echo "$as_me:$LINENO: *** Either correct the installation" >&5
+echo "$as_me: *** Either correct the installation" >&or run configure;}
+ { echo "$as_me:$LINENO: *** without explicity specifying --with-curses" >&5
+echo "$as_me: *** without explicity specifying --with-curses" >&6;}
exit 1
fi
fi
@@ -4262,7 +4264,7 @@
ac_cv_lib_ncurses_initscr=no
fi
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -4347,7 +4349,7 @@
ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -4507,7 +4509,7 @@
ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -4605,10 +4607,14 @@
if test "x${NCURSES_HEADER_FOUND}" = "x0" ; then
if test ! -z "${NCURSES_MANDATORY}" ;
then
- echo " ***"
- echo " *** It appears that you do not have the ncurses development package installed."
- echo " *** Please install it to include ncurses support, or re-run configure"
- echo " *** without explicitly specifying --with-ncurses"
+ { echo "$as_me:$LINENO: ***" >&5
+echo "$as_me: ***" >&6;}
+ { echo "$as_me:$LINENO: *** It appears that you do not have the ncurses development package installed." >&5
+echo "$as_me: *** It appears that you do not have the ncurses development package installed." >&6;}
+ { echo "$as_me:$LINENO: *** Please install it to include ncurses support" >&5
+echo "$as_me: *** Please install it to include ncurses support" >&or re-run configure;}
+ { echo "$as_me:$LINENO: *** without explicitly specifying --with-ncurses" >&5
+echo "$as_me: *** without explicitly specifying --with-ncurses" >&6;}
exit 1
fi
NCURSES_LIB=""
@@ -4624,10 +4630,14 @@
fi
elif test ! -z "${NCURSES_MANDATORY}";
then
- echo "***"
- echo "*** The ncurses installation on this system appears to be broken."
- echo "*** Either correct the installation, or run configure"
- echo "*** without explicity specifying --with-ncurses"
+ { echo "$as_me:$LINENO: ***" >&5
+echo "$as_me: ***" >&6;}
+ { echo "$as_me:$LINENO: *** The ncurses installation on this system appears to be broken." >&5
+echo "$as_me: *** The ncurses installation on this system appears to be broken." >&6;}
+ { echo "$as_me:$LINENO: *** Either correct the installation" >&5
+echo "$as_me: *** Either correct the installation" >&or run configure;}
+ { echo "$as_me:$LINENO: *** without explicity specifying --with-ncurses" >&5
+echo "$as_me: *** without explicity specifying --with-ncurses" >&6;}
exit 1
fi
fi
@@ -4734,7 +4744,7 @@
ac_cv_lib_newt_newtBell=no
fi
-rm -f conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -4819,7 +4829,7 @@
ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -4979,7 +4989,7 @@
ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }
@@ -5077,10 +5087,14 @@
if test "x${NEWT_HEADER_FOUND}" = "x0" ; then
if test ! -z "${NEWT_MANDATORY}" ;
then
- echo " ***"
- echo " *** It appears that you do not have the newt development package installed."
- echo " *** Please install it to include newt support, or re-run configure"
- echo " *** without explicitly specifying --with-newt"
+ { echo "$as_me:$LINENO: ***" >&5
+echo "$as_me: ***" >&6;}
+ { echo "$as_me:$LINENO: *** It appears that you do not have the newt development package installed." >&5
+echo "$as_me: *** It appears that you do not have the newt development package installed." >&6;}
+ { echo "$as_me:$LINENO: *** Please install it to include newt support" >&5
+echo "$as_me: *** Please install it to include newt support" >&or re-run configure;}
+ { echo "$as_me:$LINENO: *** without explicitly specifying --with-newt" >&5
+echo "$as_me: *** without explicitly specifying --with-newt" >&6;}
exit 1
fi
NEWT_LIB=""
@@ -5096,10 +5110,14 @@
fi
elif test ! -z "${NEWT_MANDATORY}";
then
- echo "***"
- echo "*** The newt installation on this system appears to be broken."
- echo "*** Either correct the installation, or run configure"
- echo "*** without explicity specifying --with-newt"
+ { echo "$as_me:$LINENO: ***" >&5
+echo "$as_me: ***" >&6;}
+ { echo "$as_me:$LINENO: *** The newt installation on this system appears to be broken." >&5
+echo "$as_me: *** The newt installation on this system appears to be broken." >&6;}
+ { echo "$as_me:$LINENO: *** Either correct the installation" >&5
+echo "$as_me: *** Either correct the installation" >&or run configure;}
+ { echo "$as_me:$LINENO: *** without explicity specifying --with-newt" >&5
+echo "$as_me: *** without explicity specifying --with-newt" >&6;}
exit 1
fi
fi
@@ -5524,7 +5542,7 @@
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59e. Invocation command line was
+generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -5567,7 +5585,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.59e,
+configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
@@ -6078,6 +6096,7 @@
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
@@ -6125,5 +6144,6 @@
fi
-echo "*** Zaptel build successfully configured ***"
-
+{ echo "$as_me:$LINENO: *** Zaptel build successfully configured ***" >&5
+echo "$as_me: *** Zaptel build successfully configured ***" >&6;}
+
Modified: trunk/configure.ac
URL: http://svn.digium.com/view/zaptel/trunk/configure.ac?rev=1297&r1=1296&r2=1297&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sun Aug 13 18:46:10 2006
@@ -49,5 +49,5 @@
AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
AC_OUTPUT
-echo "*** Zaptel build successfully configured ***"
+AC_MSG_NOTICE(*** Zaptel build successfully configured ***)
More information about the svn-commits
mailing list