[asterisk-commits] kpfleming: branch 1.4 r53850 - /branches/1.4/
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Feb 9 23:06:08 MST 2007
Author: kpfleming
Date: Sat Feb 10 00:06:08 2007
New Revision: 53850
URL: http://svn.digium.com/view/asterisk?view=rev&rev=53850
Log:
don't display the --with-imap message unless --with-imap was specified without a path
use '-n' instead of '! -z' for tests
Modified:
branches/1.4/acinclude.m4
branches/1.4/configure
branches/1.4/configure.ac
Modified: branches/1.4/acinclude.m4
URL: http://svn.digium.com/view/asterisk/branches/1.4/acinclude.m4?view=diff&rev=53850&r1=53849&r2=53850
==============================================================================
--- branches/1.4/acinclude.m4 (original)
+++ branches/1.4/acinclude.m4 Sat Feb 10 00:06:08 2007
@@ -71,7 +71,7 @@
fi
fi
if test "x${$1_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${$1_MANDATORY}" ;
+ if test -n "${$1_MANDATORY}" ;
then
AC_MSG_NOTICE([***])
AC_MSG_NOTICE([*** It appears that you do not have the $2 development package installed.])
@@ -86,7 +86,7 @@
PBX_$1=1
AC_DEFINE_UNQUOTED([HAVE_$1], 1, [Define to indicate the ${$1_DESCRIP} library])
fi
- elif test ! -z "${$1_MANDATORY}";
+ elif test -n "${$1_MANDATORY}";
then
AC_MSG_NOTICE([***])
AC_MSG_NOTICE([*** The ${$1_DESCRIP} installation on this system appears to be broken.])
Modified: branches/1.4/configure
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure?view=diff&rev=53850&r1=53849&r2=53850
==============================================================================
--- branches/1.4/configure (original)
+++ branches/1.4/configure Sat Feb 10 00:06:08 2007
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 52997 .
+# From configure.ac Revision: 53715 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@@ -16169,7 +16169,7 @@
fi
fi
if test "x${ALSA_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${ALSA_MANDATORY}" ;
+ if test -n "${ALSA_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -16192,7 +16192,7 @@
_ACEOF
fi
- elif test ! -z "${ALSA_MANDATORY}";
+ elif test -n "${ALSA_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -16568,7 +16568,7 @@
fi
fi
if test "x${CURSES_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${CURSES_MANDATORY}" ;
+ if test -n "${CURSES_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -16591,7 +16591,7 @@
_ACEOF
fi
- elif test ! -z "${CURSES_MANDATORY}";
+ elif test -n "${CURSES_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -17646,7 +17646,7 @@
fi
fi
if test "x${IKSEMEL_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${IKSEMEL_MANDATORY}" ;
+ if test -n "${IKSEMEL_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -17669,7 +17669,7 @@
_ACEOF
fi
- elif test ! -z "${IKSEMEL_MANDATORY}";
+ elif test -n "${IKSEMEL_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -18046,7 +18046,7 @@
fi
fi
if test "x${GNUTLS_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${GNUTLS_MANDATORY}" ;
+ if test -n "${GNUTLS_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -18069,7 +18069,7 @@
_ACEOF
fi
- elif test ! -z "${GNUTLS_MANDATORY}";
+ elif test -n "${GNUTLS_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -18091,14 +18091,16 @@
if test "${USE_IMAP_TK}" != "no"; then
if test "${IMAP_TK_DIR}" = ""; then
IMAP_TK_DIR=`pwd`"/../imap-2004g"
- { echo "$as_me:$LINENO: The --with-imap option does not search your system for installed" >&5
+ if test -n "${IMAP_TK_MANDATORY}"; then
+ { echo "$as_me:$LINENO: The --with-imap option does not search your system for installed" >&5
echo "$as_me: The --with-imap option does not search your system for installed" >&6;}
- { echo "$as_me:$LINENO: c-client library/header files. Since you did not provide a path" >&5
+ { echo "$as_me:$LINENO: c-client library/header files. Since you did not provide a path" >&5
echo "$as_me: c-client library/header files. Since you did not provide a path" >&6;}
- { echo "$as_me:$LINENO: the configure script will assume you have placed built the c-client" >&5
+ { echo "$as_me:$LINENO: the configure script will assume you have placed built the c-client" >&5
echo "$as_me: the configure script will assume you have placed built the c-client" >&6;}
- { echo "$as_me:$LINENO: files at ${IMAP_TK_DIR}, as outlined in the doc/imapstorage.txt file." >&5
+ { echo "$as_me:$LINENO: files at ${IMAP_TK_DIR}, as outlined in the doc/imapstorage.txt file." >&5
echo "$as_me: files at ${IMAP_TK_DIR}, as outlined in the doc/imapstorage.txt file." >&6;}
+ fi
fi
{ echo "$as_me:$LINENO: checking for UW IMAP Toolkit c-client library" >&5
echo $ECHO_N "checking for UW IMAP Toolkit c-client library... $ECHO_C" >&6; }
@@ -18315,7 +18317,7 @@
_ACEOF
fi
- elif test ! -z "${IMAP_TK_MANDATORY}"; then
+ elif test -n "${IMAP_TK_MANDATORY}"; then
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
{ echo "$as_me:$LINENO: ***" >&5
@@ -18416,7 +18418,7 @@
#define HAVE_LIBKDE 1
_ACEOF
- elif test ! -z "${KDE_MANDATORY}"; then
+ elif test -n "${KDE_MANDATORY}"; then
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
{ echo "$as_me:$LINENO: ***" >&5
@@ -18911,7 +18913,7 @@
fi
fi
if test "x${MISDN_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${MISDN_MANDATORY}" ;
+ if test -n "${MISDN_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -18934,7 +18936,7 @@
_ACEOF
fi
- elif test ! -z "${MISDN_MANDATORY}";
+ elif test -n "${MISDN_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -19311,7 +19313,7 @@
fi
fi
if test "x${ISDNNET_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${ISDNNET_MANDATORY}" ;
+ if test -n "${ISDNNET_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -19334,7 +19336,7 @@
_ACEOF
fi
- elif test ! -z "${ISDNNET_MANDATORY}";
+ elif test -n "${ISDNNET_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -19709,7 +19711,7 @@
fi
fi
if test "x${SUPPSERV_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${SUPPSERV_MANDATORY}" ;
+ if test -n "${SUPPSERV_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -19732,7 +19734,7 @@
_ACEOF
fi
- elif test ! -z "${SUPPSERV_MANDATORY}";
+ elif test -n "${SUPPSERV_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -20109,7 +20111,7 @@
fi
fi
if test "x${NBS_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${NBS_MANDATORY}" ;
+ if test -n "${NBS_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -20132,7 +20134,7 @@
_ACEOF
fi
- elif test ! -z "${NBS_MANDATORY}";
+ elif test -n "${NBS_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -20508,7 +20510,7 @@
fi
fi
if test "x${NCURSES_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${NCURSES_MANDATORY}" ;
+ if test -n "${NCURSES_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -20531,7 +20533,7 @@
_ACEOF
fi
- elif test ! -z "${NCURSES_MANDATORY}";
+ elif test -n "${NCURSES_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -20845,7 +20847,7 @@
if test "${ac_cv_lib_netsnmp_snmp_register_callback}" = "yes"; then
NETSNMP_LIB="${NETSNMP_libs}"
PBX_NETSNMP=1
- elif test ! -z "${NETSNMP_MANDATORY}";
+ elif test -n "${NETSNMP_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -20857,7 +20859,7 @@
echo "$as_me: *** including --without-netsnmp" >&6;}
exit 1
fi
-elif test ! -z "${NETSNMP_MANDATORY}";
+elif test -n "${NETSNMP_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -21231,7 +21233,7 @@
fi
fi
if test "x${NEWT_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${NEWT_MANDATORY}" ;
+ if test -n "${NEWT_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -21254,7 +21256,7 @@
_ACEOF
fi
- elif test ! -z "${NEWT_MANDATORY}";
+ elif test -n "${NEWT_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -21630,7 +21632,7 @@
fi
fi
if test "x${UNIXODBC_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${UNIXODBC_MANDATORY}" ;
+ if test -n "${UNIXODBC_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -21653,7 +21655,7 @@
_ACEOF
fi
- elif test ! -z "${UNIXODBC_MANDATORY}";
+ elif test -n "${UNIXODBC_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -22029,7 +22031,7 @@
fi
fi
if test "x${OGG_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${OGG_MANDATORY}" ;
+ if test -n "${OGG_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -22052,7 +22054,7 @@
_ACEOF
fi
- elif test ! -z "${OGG_MANDATORY}";
+ elif test -n "${OGG_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -22428,7 +22430,7 @@
fi
fi
if test "x${OSPTK_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${OSPTK_MANDATORY}" ;
+ if test -n "${OSPTK_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -22451,7 +22453,7 @@
_ACEOF
fi
- elif test ! -z "${OSPTK_MANDATORY}";
+ elif test -n "${OSPTK_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -23105,7 +23107,7 @@
fi
fi
if test "x${OSS_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${OSS_MANDATORY}" ;
+ if test -n "${OSS_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -23128,7 +23130,7 @@
_ACEOF
fi
- elif test ! -z "${OSS_MANDATORY}";
+ elif test -n "${OSS_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -23445,7 +23447,7 @@
PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz"
PGSQL_INCLUDE="-I${PGSQL_includedir}"
PBX_PGSQL=1
- elif test ! -z "${PGSQL_MANDATORY}";
+ elif test -n "${PGSQL_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -23457,7 +23459,7 @@
echo "$as_me: *** including --without-postgres" >&6;}
exit 1
fi
-elif test ! -z "${PGSQL_MANDATORY}";
+elif test -n "${PGSQL_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -23831,7 +23833,7 @@
fi
fi
if test "x${POPT_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${POPT_MANDATORY}" ;
+ if test -n "${POPT_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -23854,7 +23856,7 @@
_ACEOF
fi
- elif test ! -z "${POPT_MANDATORY}";
+ elif test -n "${POPT_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -24230,7 +24232,7 @@
fi
fi
if test "x${PRI_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${PRI_MANDATORY}" ;
+ if test -n "${PRI_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -24253,7 +24255,7 @@
_ACEOF
fi
- elif test ! -z "${PRI_MANDATORY}";
+ elif test -n "${PRI_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -24269,7 +24271,7 @@
if test "${USE_PWLIB}" != "no"; then
- if test ! -z "${PWLIB_DIR}"; then
+ if test -n "${PWLIB_DIR}"; then
PWLIBDIR="${PWLIB_DIR}"
fi
@@ -24813,7 +24815,7 @@
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 -n "${PWLIB_MANDATORY}"; then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
{ echo "$as_me:$LINENO: *** The PWLIB installation on this system appears to be broken." >&5
@@ -24826,7 +24828,7 @@
fi
if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
- if test ! -z "${OPENH323_DIR}"; then
+ if test -n "${OPENH323_DIR}"; then
OPENH323DIR="${OPENH323_DIR}"
fi
@@ -25200,7 +25202,7 @@
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 -n "${OPENH323_MANDATORY}"; then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
{ echo "$as_me:$LINENO: *** The OPENH323 installation on this system appears to be broken." >&5
@@ -25459,7 +25461,7 @@
QTMOC="$ac_cv_path_QTMOC"
fi
- elif test ! -z "${QT_MANDATORY}";
+ elif test -n "${QT_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -25841,7 +25843,7 @@
fi
fi
if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${RADIUS_MANDATORY}" ;
+ if test -n "${RADIUS_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -25864,7 +25866,7 @@
_ACEOF
fi
- elif test ! -z "${RADIUS_MANDATORY}";
+ elif test -n "${RADIUS_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -26240,7 +26242,7 @@
fi
fi
if test "x${SPEEX_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${SPEEX_MANDATORY}" ;
+ if test -n "${SPEEX_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -26263,7 +26265,7 @@
_ACEOF
fi
- elif test ! -z "${SPEEX_MANDATORY}";
+ elif test -n "${SPEEX_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -26639,7 +26641,7 @@
fi
fi
if test "x${SQLITE_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${SQLITE_MANDATORY}" ;
+ if test -n "${SQLITE_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -26662,7 +26664,7 @@
_ACEOF
fi
- elif test ! -z "${SQLITE_MANDATORY}";
+ elif test -n "${SQLITE_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -27038,7 +27040,7 @@
fi
fi
if test "x${OPENSSL_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${OPENSSL_MANDATORY}" ;
+ if test -n "${OPENSSL_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -27061,7 +27063,7 @@
_ACEOF
fi
- elif test ! -z "${OPENSSL_MANDATORY}";
+ elif test -n "${OPENSSL_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -27437,7 +27439,7 @@
fi
fi
if test "x${FREETDS_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${FREETDS_MANDATORY}" ;
+ if test -n "${FREETDS_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -27460,7 +27462,7 @@
_ACEOF
fi
- elif test ! -z "${FREETDS_MANDATORY}";
+ elif test -n "${FREETDS_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -27853,7 +27855,7 @@
fi
fi
if test "x${TERMCAP_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${TERMCAP_MANDATORY}" ;
+ if test -n "${TERMCAP_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -27876,7 +27878,7 @@
_ACEOF
fi
- elif test ! -z "${TERMCAP_MANDATORY}";
+ elif test -n "${TERMCAP_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -28252,7 +28254,7 @@
fi
fi
if test "x${TINFO_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${TINFO_MANDATORY}" ;
+ if test -n "${TINFO_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -28275,7 +28277,7 @@
_ACEOF
fi
- elif test ! -z "${TINFO_MANDATORY}";
+ elif test -n "${TINFO_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -28655,7 +28657,7 @@
fi
fi
if test "x${TONEZONE_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${TONEZONE_MANDATORY}" ;
+ if test -n "${TONEZONE_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -28678,7 +28680,7 @@
_ACEOF
fi
- elif test ! -z "${TONEZONE_MANDATORY}";
+ elif test -n "${TONEZONE_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -29054,7 +29056,7 @@
fi
fi
if test "x${VORBIS_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${VORBIS_MANDATORY}" ;
+ if test -n "${VORBIS_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -29077,7 +29079,7 @@
_ACEOF
fi
- elif test ! -z "${VORBIS_MANDATORY}";
+ elif test -n "${VORBIS_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -29180,7 +29182,7 @@
#define HAVE_VPB 1
_ACEOF
- elif test ! -z "${VPB_MANDATORY}"; then
+ elif test -n "${VPB_MANDATORY}"; then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
{ echo "$as_me:$LINENO: *** The VoiceTronix (vpb) installation on this system appears to be broken." >&5
@@ -29561,7 +29563,7 @@
fi
fi
if test "x${ZLIB_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${ZLIB_MANDATORY}" ;
+ if test -n "${ZLIB_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -29584,7 +29586,7 @@
_ACEOF
fi
- elif test ! -z "${ZLIB_MANDATORY}";
+ elif test -n "${ZLIB_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
@@ -29667,7 +29669,7 @@
#define HAVE_ZAPTEL 1
_ACEOF
- elif test ! -z "${ZAPTEL_MANDATORY}";
+ elif test -n "${ZAPTEL_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=53850&r1=53849&r2=53850
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Sat Feb 10 00:06:08 2007
@@ -431,10 +431,12 @@
if test "${USE_IMAP_TK}" != "no"; then
if test "${IMAP_TK_DIR}" = ""; then
IMAP_TK_DIR=`pwd`"/../imap-2004g"
- AC_MSG_NOTICE([The --with-imap option does not search your system for installed])
- AC_MSG_NOTICE([c-client library/header files. Since you did not provide a path])
- AC_MSG_NOTICE([the configure script will assume you have placed built the c-client])
- AC_MSG_NOTICE([files at ${IMAP_TK_DIR}, as outlined in the doc/imapstorage.txt file.])
+ if test -n "${IMAP_TK_MANDATORY}"; then
+ AC_MSG_NOTICE([The --with-imap option does not search your system for installed])
+ AC_MSG_NOTICE([c-client library/header files. Since you did not provide a path])
+ AC_MSG_NOTICE([the configure script will assume you have placed built the c-client])
+ AC_MSG_NOTICE([files at ${IMAP_TK_DIR}, as outlined in the doc/imapstorage.txt file.])
+ fi
fi
AC_MSG_CHECKING(for UW IMAP Toolkit c-client library)
saved_cppflags="${CPPFLAGS}"
@@ -567,7 +569,7 @@
if test "${ac_cv_imap_tk2006}" = "yes"; then
AC_DEFINE([HAVE_IMAP_TK2006], 1, [Define if your system has the UW IMAP Toolkit c-client library version 2006 or greater.])
fi
- elif test ! -z "${IMAP_TK_MANDATORY}"; then
+ elif test -n "${IMAP_TK_MANDATORY}"; then
AC_MSG_RESULT(no)
AC_MSG_NOTICE([***])
AC_MSG_NOTICE([*** The UW IMAP Toolkit installation on this system appears to be broken.])
@@ -613,7 +615,7 @@
fi
PBX_KDE=1
AC_DEFINE([HAVE_LIBKDE], 1, [Define if your system has the KDE libraries.])
- elif test ! -z "${KDE_MANDATORY}"; then
+ elif test -n "${KDE_MANDATORY}"; then
AC_MSG_RESULT(no)
AC_MSG_NOTICE([***])
AC_MSG_NOTICE([*** The KDE installation on this system appears to be broken.])
@@ -671,7 +673,7 @@
if test "${ac_cv_lib_netsnmp_snmp_register_callback}" = "yes"; then
NETSNMP_LIB="${NETSNMP_libs}"
PBX_NETSNMP=1
- elif test ! -z "${NETSNMP_MANDATORY}";
+ elif test -n "${NETSNMP_MANDATORY}";
then
AC_MSG_NOTICE([***])
AC_MSG_NOTICE([*** The Net-SNMP installation on this system appears to be broken.])
@@ -679,7 +681,7 @@
AC_MSG_NOTICE([*** including --without-netsnmp])
exit 1
fi
-elif test ! -z "${NETSNMP_MANDATORY}";
+elif test -n "${NETSNMP_MANDATORY}";
then
AC_MSG_NOTICE([***])
AC_MSG_NOTICE([*** The Net-SNMP installation on this system appears to be broken.])
@@ -740,7 +742,7 @@
PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz"
PGSQL_INCLUDE="-I${PGSQL_includedir}"
PBX_PGSQL=1
- elif test ! -z "${PGSQL_MANDATORY}";
+ elif test -n "${PGSQL_MANDATORY}";
then
AC_MSG_NOTICE([***])
AC_MSG_NOTICE([*** The PostgreSQL installation on this system appears to be broken.])
@@ -748,7 +750,7 @@
AC_MSG_NOTICE([*** including --without-postgres])
exit 1
fi
-elif test ! -z "${PGSQL_MANDATORY}";
+elif test -n "${PGSQL_MANDATORY}";
then
AC_MSG_NOTICE([***])
AC_MSG_NOTICE([*** The PostgreSQL installation on this system appears to be broken.])
@@ -762,7 +764,7 @@
AST_EXT_LIB_CHECK([PRI], [pri], [pri_call], [libpri.h])
if test "${USE_PWLIB}" != "no"; then
- if test ! -z "${PWLIB_DIR}"; then
+ if test -n "${PWLIB_DIR}"; then
PWLIBDIR="${PWLIB_DIR}"
fi
AST_CHECK_PWLIB()
@@ -780,7 +782,7 @@
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 -n "${PWLIB_MANDATORY}"; then
AC_MSG_NOTICE([***])
AC_MSG_NOTICE([*** The PWLIB installation on this system appears to be broken.])
AC_MSG_NOTICE([*** Either correct the installation, or run configure])
@@ -789,7 +791,7 @@
fi
if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
- if test ! -z "${OPENH323_DIR}"; then
+ if test -n "${OPENH323_DIR}"; then
OPENH323DIR="${OPENH323_DIR}"
fi
AST_CHECK_OPENH323()
@@ -804,7 +806,7 @@
[H323EndPoint ep = H323EndPoint();],
[${PWLIB_INCLUDE}], [${PWLIB_LIB}])
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 -n "${OPENH323_MANDATORY}"; then
AC_MSG_NOTICE([***])
AC_MSG_NOTICE([*** The OPENH323 installation on this system appears to be broken.])
AC_MSG_NOTICE([*** Either correct the installation, or run configure])
@@ -872,7 +874,7 @@
PBX_QT=1
AC_DEFINE([HAVE_QT], 1, [Define if your system has the Qt library])
AC_PATH_TOOL(QTMOC, moc, No)
- elif test ! -z "${QT_MANDATORY}";
+ elif test -n "${QT_MANDATORY}";
then
AC_MSG_NOTICE([***])
AC_MSG_NOTICE([*** The Qt installation on this system appears to be broken.])
@@ -962,7 +964,7 @@
fi
PBX_VPB=1
AC_DEFINE([HAVE_VPB], 1, [Define if your system has the VoiceTronix API libraries.])
- elif test ! -z "${VPB_MANDATORY}"; then
+ elif test -n "${VPB_MANDATORY}"; then
AC_MSG_NOTICE([***])
AC_MSG_NOTICE([*** The VoiceTronix (vpb) installation on this system appears to be broken.])
AC_MSG_NOTICE([*** Either correct the installation, or run configure])
@@ -1001,7 +1003,7 @@
fi
PBX_ZAPTEL=1
AC_DEFINE([HAVE_ZAPTEL], 1, [Define if your system has the Zaptel headers.])
- elif test ! -z "${ZAPTEL_MANDATORY}";
+ elif test -n "${ZAPTEL_MANDATORY}";
then
AC_MSG_NOTICE([***])
AC_MSG_NOTICE([*** The Zaptel installation on this system appears to be broken.])
More information about the asterisk-commits
mailing list