kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@48528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-12-16 21:34:41 +00:00
parent 0509ca82b4
commit ee8ce744c3
4 changed files with 1841 additions and 4923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
acinclude.m4
View File

@@ -69,10 +69,10 @@ if test "${USE_$1}" != "no"; then
if test "x${$1_HEADER_FOUND}" = "x0" ; then if test "x${$1_HEADER_FOUND}" = "x0" ; then
if test ! -z "${$1_MANDATORY}" ; if test ! -z "${$1_MANDATORY}" ;
then then
AC_MSG_NOTICE( ***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE( *** It appears that you do not have the $2 development package installed.) AC_MSG_NOTICE([*** It appears that you do not have the $2 development package installed.])
AC_MSG_NOTICE( *** Please install it to include ${$1_DESCRIP} support, or re-run configure) AC_MSG_NOTICE([*** Please install it to include ${$1_DESCRIP} support, or re-run configure])
AC_MSG_NOTICE( *** without explicitly specifying --with-${$1_OPTION}) AC_MSG_NOTICE([*** without explicitly specifying --with-${$1_OPTION}])
exit 1 exit 1
fi fi
$1_LIB="" $1_LIB=""
@@ -84,10 +84,10 @@ if test "${USE_$1}" != "no"; then
fi fi
elif test ! -z "${$1_MANDATORY}"; elif test ! -z "${$1_MANDATORY}";
then then
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** The ${$1_DESCRIP} installation on this system appears to be broken.) AC_MSG_NOTICE([*** The ${$1_DESCRIP} installation on this system appears to be broken.])
AC_MSG_NOTICE(*** Either correct the installation, or run configure) AC_MSG_NOTICE([*** Either correct the installation, or run configure])
AC_MSG_NOTICE(*** without explicitly specifying --with-${$1_OPTION}) AC_MSG_NOTICE([*** without explicitly specifying --with-${$1_OPTION}])
exit 1 exit 1
fi fi
fi fi

6602
configure vendored
View File

File diff suppressed because it is too large Load Diff

118
configure.ac
View File

@@ -518,10 +518,10 @@ if test "${USE_IMAP_TK}" != "no"; then
fi fi
elif test ! -z "${IMAP_TK_MANDATORY}"; then elif test ! -z "${IMAP_TK_MANDATORY}"; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** The UW IMAP Toolkit installation on this system appears to be broken.) AC_MSG_NOTICE([*** The UW IMAP Toolkit installation on this system appears to be 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-imap.) AC_MSG_NOTICE([*** including --without-imap.])
exit 1 exit 1
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@@ -564,10 +564,10 @@ if test "${USE_KDE}" != "no"; then
AC_DEFINE([HAVE_LIBKDE], 1, [Define if your system has the KDE libraries.]) AC_DEFINE([HAVE_LIBKDE], 1, [Define if your system has the KDE libraries.])
elif test ! -z "${KDE_MANDATORY}"; then elif test ! -z "${KDE_MANDATORY}"; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** The KDE installation on this system appears to be broken.) AC_MSG_NOTICE([*** The KDE installation on this system appears to be 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-kde.) AC_MSG_NOTICE([*** including --without-kde.])
exit 1 exit 1
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@@ -600,11 +600,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
@@ -622,18 +622,18 @@ if test x"${NETSNMP_CONFIG}" != xNo; then
PBX_NETSNMP=1 PBX_NETSNMP=1
elif test ! -z "${NETSNMP_MANDATORY}"; elif test ! -z "${NETSNMP_MANDATORY}";
then then
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** The Net-SNMP installation on this system appears to be broken.) AC_MSG_NOTICE([*** The Net-SNMP installation on this system appears to be 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-netsnmp) AC_MSG_NOTICE([*** including --without-netsnmp])
exit 1 exit 1
fi fi
elif test ! -z "${NETSNMP_MANDATORY}"; elif test ! -z "${NETSNMP_MANDATORY}";
then then
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** The Net-SNMP installation on this system appears to be broken.) AC_MSG_NOTICE([*** The Net-SNMP installation on this system appears to be 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-netsnmp) AC_MSG_NOTICE([*** including --without-netsnmp])
exit 1 exit 1
fi fi
@@ -667,11 +667,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
@@ -691,18 +691,18 @@ if test "${PG_CONFIG}" != No; then
PBX_PGSQL=1 PBX_PGSQL=1
elif test ! -z "${PGSQL_MANDATORY}"; elif test ! -z "${PGSQL_MANDATORY}";
then then
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** The PostgreSQL installation on this system appears to be broken.) AC_MSG_NOTICE([*** The PostgreSQL installation on this system appears to be 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-postgres) AC_MSG_NOTICE([*** including --without-postgres])
exit 1 exit 1
fi fi
elif test ! -z "${PGSQL_MANDATORY}"; elif test ! -z "${PGSQL_MANDATORY}";
then then
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** The PostgreSQL installation on this system appears to be broken.) AC_MSG_NOTICE([*** The PostgreSQL installation on this system appears to be 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-postgres) AC_MSG_NOTICE([*** including --without-postgres])
exit 1 exit 1
fi fi
@@ -730,10 +730,10 @@ if test "${USE_PWLIB}" != "no"; then
fi fi
if test "${USE_PWLIB}" != "no" -a "x${ac_cv_lib_PWLIB}" != "xyes" -a ! -z "${PWLIB_MANDATORY}"; then if test "${USE_PWLIB}" != "no" -a "x${ac_cv_lib_PWLIB}" != "xyes" -a ! -z "${PWLIB_MANDATORY}"; then
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** The PWLIB installation on this system appears to be broken.) AC_MSG_NOTICE([*** The PWLIB installation on this system appears to be 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-pwlib) AC_MSG_NOTICE([*** including --without-pwlib])
exit 1 exit 1
fi fi
@@ -754,10 +754,10 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
[${PWLIB_INCLUDE}], [${PWLIB_LIB}]) [${PWLIB_INCLUDE}], [${PWLIB_LIB}])
fi fi
if test "${USE_OPENH323}" != "no" -a "x${ac_cv_lib_OPENH323}" != "xyes" -a ! -z "${OPENH323_MANDATORY}"; then if test "${USE_OPENH323}" != "no" -a "x${ac_cv_lib_OPENH323}" != "xyes" -a ! -z "${OPENH323_MANDATORY}"; then
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** The OPENH323 installation on this system appears to be broken.) AC_MSG_NOTICE([*** The OPENH323 installation on this system appears to be 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-h323) AC_MSG_NOTICE([*** including --without-h323])
exit 1 exit 1
fi fi
@@ -823,10 +823,10 @@ if test "${USE_QT}" != "no"; then
AC_PATH_TOOL(QTMOC, moc, No) AC_PATH_TOOL(QTMOC, moc, No)
elif test ! -z "${QT_MANDATORY}"; elif test ! -z "${QT_MANDATORY}";
then then
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** The Qt installation on this system appears to be broken.) AC_MSG_NOTICE([*** The Qt installation on this system appears to be 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-qt.) AC_MSG_NOTICE([*** including --without-qt.])
exit 1 exit 1
fi fi
fi fi
@@ -912,10 +912,10 @@ if test "${USE_VPB}" != "no"; then
PBX_VPB=1 PBX_VPB=1
AC_DEFINE([HAVE_VPB], 1, [Define if your system has the VoiceTronix API libraries.]) AC_DEFINE([HAVE_VPB], 1, [Define if your system has the VoiceTronix API libraries.])
elif test ! -z "${VPB_MANDATORY}"; then elif test ! -z "${VPB_MANDATORY}"; then
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** The VoiceTronix (vpb) installation on this system appears to be broken.) AC_MSG_NOTICE([*** The VoiceTronix (vpb) installation on this system appears to be 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-vpb.) AC_MSG_NOTICE([*** including --without-vpb.])
exit 1 exit 1
fi fi
fi fi
@@ -952,10 +952,10 @@ if test "${USE_ZAPTEL}" != "no"; then
AC_DEFINE([HAVE_ZAPTEL], 1, [Define if your system has the Zaptel headers.]) AC_DEFINE([HAVE_ZAPTEL], 1, [Define if your system has the Zaptel headers.])
elif test ! -z "${ZAPTEL_MANDATORY}"; elif test ! -z "${ZAPTEL_MANDATORY}";
then then
AC_MSG_NOTICE(***) AC_MSG_NOTICE([***])
AC_MSG_NOTICE(*** The Zaptel installation on this system appears to be broken.) AC_MSG_NOTICE([*** The Zaptel installation on this system appears to be 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-zaptel.) AC_MSG_NOTICE([*** including --without-zaptel.])
exit 1 exit 1
fi fi
fi fi
@@ -982,11 +982,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

@@ -539,6 +539,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
@@ -553,6 +560,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