kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-24 05:38:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 48528 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48528 | kpfleming | 2006-12-16 15:34:41 -0600 (Sat, 16 Dec 2006) | 2 lines

use m4 quoting for AC_MSG_NOTICE calls, to keep these calls from thinking they have multiple arguments

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-12-16 21:38:10 +00:00
parent 89c41e2403
commit a40b78b885
4 changed files with 1795 additions and 5281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acinclude.m4
View File

@@ -50,10 +50,10 @@ AC_DEFUN([AST_CHECK_MANDATORY],
if test ${err} = "0" ; then AC_MSG_RESULT(fail) ; fi if test ${err} = "0" ; then AC_MSG_RESULT(fail) ; fi
AC_MSG_RESULT() AC_MSG_RESULT()
eval "a=\${${i}_OPTION}" eval "a=\${${i}_OPTION}"
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** The $i installation appears to be missing or broken.) AC_MSG_NOTICE([*** The $i installation appears to be missing or broken.])
AC_MSG_NOTICE(*** Either correct the installation, or run configure) AC_MSG_NOTICE([*** Either correct the installation, or run configure])
AC_MSG_NOTICE(*** including --without-${a}.) AC_MSG_NOTICE([*** including --without-${a}.])
err=1 err=1
done done
if test $err = 1 ; then exit 1; fi if test $err = 1 ; then exit 1; fi

7010
configure vendored
View File

File diff suppressed because it is too large Load Diff

30
configure.ac
View File

@@ -594,11 +594,11 @@ if test "${USE_NETSNMP}" != "no"; then
if test "x${NETSNMP_DIR}" != "x"; then if test "x${NETSNMP_DIR}" != "x"; then
AC_PATH_TOOL([NETSNMP_CONFIG], [net-snmp-config], No, [${NETSNMP_DIR}/bin]) AC_PATH_TOOL([NETSNMP_CONFIG], [net-snmp-config], No, [${NETSNMP_DIR}/bin])
if test x"${NETSNMP_CONFIG}" = xNo; then if test x"${NETSNMP_CONFIG}" = xNo; then
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** net-snmp-config was not found in the path you specified:) AC_MSG_NOTICE([*** net-snmp-config was not found in the path you specified:])
AC_MSG_NOTICE(*** ${NETSNMP_DIR}/bin) AC_MSG_NOTICE([*** ${NETSNMP_DIR}/bin])
AC_MSG_NOTICE(*** Either correct the installation, or run configure) AC_MSG_NOTICE([*** Either correct the installation, or run configure])
AC_MSG_NOTICE(*** including --without-netsnmp) AC_MSG_NOTICE([*** including --without-netsnmp])
exit 1 exit 1
fi fi
else else
@@ -635,11 +635,11 @@ if test "${USE_PGSQL}" != "no"; then
if test "x${PGSQL_DIR}" != "x"; then if test "x${PGSQL_DIR}" != "x"; then
AC_PATH_TOOL([PG_CONFIG], [pg_config], No, [${PGSQL_DIR}/bin]) AC_PATH_TOOL([PG_CONFIG], [pg_config], No, [${PGSQL_DIR}/bin])
if test x"${PG_CONFIG}" = xNo; then if test x"${PG_CONFIG}" = xNo; then
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** pg_config was not found in the path you specified:) AC_MSG_NOTICE([*** pg_config was not found in the path you specified:])
AC_MSG_NOTICE(*** ${PGSQL_DIR}/bin) AC_MSG_NOTICE([*** ${PGSQL_DIR}/bin])
AC_MSG_NOTICE(*** Either correct the installation, or run configure) AC_MSG_NOTICE([*** Either correct the installation, or run configure])
AC_MSG_NOTICE(*** including --without-postgres) AC_MSG_NOTICE([*** including --without-postgres])
exit 1 exit 1
fi fi
else else
@@ -881,11 +881,11 @@ if test "${USE_ZAPTEL}" != "no"; then
) )
CPPFLAGS="${saved_cppflags}" CPPFLAGS="${saved_cppflags}"
if test "${ac_cv_zaptel_h}" = "yes"; then if test "${ac_cv_zaptel_h}" = "yes"; then
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** The Zaptel installation on this system is too old) AC_MSG_NOTICE([*** The Zaptel installation on this system is too old])
AC_MSG_NOTICE(*** to be useable with this version of Asterisk.) AC_MSG_NOTICE([*** to be useable with this version of Asterisk.])
AC_MSG_NOTICE(*** Either upgrade your Zaptel installation, or run configure) AC_MSG_NOTICE([*** Either upgrade your Zaptel installation, or run configure])
AC_MSG_NOTICE(*** including --without-zaptel.) AC_MSG_NOTICE([*** including --without-zaptel.])
exit 1 exit 1
fi fi
fi fi

28
include/asterisk/autoconfig.h.in
View File

@@ -658,6 +658,13 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */ /* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME #undef TM_IN_SYS_TIME
/* Define to 1 if on AIX 3.
System headers sometimes define this.
We just want to avoid a redefinition error message. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Number of bits in a file offset, on hosts where this is settable. */ /* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS #undef _FILE_OFFSET_BITS
@@ -672,6 +679,27 @@
/* Define for large files, on AIX-style hosts. */ /* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES #undef _LARGE_FILES
/* Define to 1 if on MINIX. */
#undef _MINIX
/* Define to 2 if the system does not provide POSIX.1 features except with
this defined. */
#undef _POSIX_1_SOURCE
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
/* Enable extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Define like PROTOTYPES; this can be used by system headers. */ /* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES #undef __PROTOTYPES