diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-10 06:14:55 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-10 06:14:55 +0000 |
| commit | 65019aebdf4ae2764c282e5b56fb0e4e0a1b5a53 (patch) | |
| tree | 3430e26abfc317a52ef0fc4e081b0e2c5661cc66 /configure.ac | |
| parent | 512ca565ba64b9377bc7324df865da34536e9f06 (diff) | |
Merged revisions 53850 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r53850 | kpfleming | 2007-02-10 00:06:08 -0600 (Sat, 10 Feb 2007) | 3 lines
don't display the --with-imap message unless --with-imap was specified without a path
use '-n' instead of '! -z' for tests
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@53851 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 125728eae..e6478ec15 100644 --- a/configure.ac +++ b/configure.ac @@ -428,10 +428,12 @@ fi 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}" @@ -709,7 +711,7 @@ AST_EXT_LIB_CHECK([PRI], [pri], [pri_call], [libpri.h]) AST_EXT_LIB_CHECK([SS7], [ss7], [ss7_new], [libss7.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() @@ -728,7 +730,7 @@ if test "${USE_PWLIB}" != "no"; then 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() |