Fix a bit of wrong logic in the configure script that caused problems when trying...

without IMAP. Patch suggestion from phsultan, but I modified it slightly.

(closes issue #12003)
Reported by: pj
Tested by: putnopvut

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@103713 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index 105a3e768cbcd80742b1da05ac04dded6949544c..12c013ac8d67f44adcb572879e78eabb19e1a588 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 103698 .
+# From configure.ac Revision: 103709 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.4.
 #
@@ -19271,13 +19271,13 @@ fi
 fi
 
 if test "${USE_IMAP_TK}" != "no"; then
+       saved_cppflags="${CPPFLAGS}"
+       saved_libs="${LIBS}"
        switch_to_system_on_failure="no"
        if test "${IMAP_TK_DIR}" = ""; then
                IMAP_TK_DIR=`pwd`"/../imap-2004g"
                switch_to_system_on_failure="yes"
        fi
-       saved_cppflags="${CPPFLAGS}"
-       saved_libs="${LIBS}"
        if test "${IMAP_TK_DIR}" != "system"; then
                { 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; }
@@ -19881,8 +19881,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        if test "${ac_cv_imap_tk}" = "yes"; then
                { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-               CPPFLAGS="${saved_cppflags}"
-               LIBS="${saved_libs}"
                IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}`
                IMAP_TK_INCLUDE="${imap_include}"
                PBX_IMAP_TK=1
@@ -19914,6 +19912,8 @@ echo "$as_me: *** including --without-imap." >&6;}
                { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
        fi
+       CPPFLAGS="${saved_cppflags}"
+       LIBS="${saved_libs}"
 fi
 
 # Needed by unixodbc

diff --git a/configure.ac b/configure.ac
index 63fd4d43713fc899d17edf41a382b8d86e2a290d..171f393650147adfea5f512b1e7d7f2d56dff1f5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -479,13 +479,13 @@ if test "${PBX_IKSEMEL}" = 1; then
 fi
 
 if test "${USE_IMAP_TK}" != "no"; then
+       saved_cppflags="${CPPFLAGS}"
+       saved_libs="${LIBS}"
        switch_to_system_on_failure="no"
        if test "${IMAP_TK_DIR}" = ""; then
                IMAP_TK_DIR=`pwd`"/../imap-2004g"
                switch_to_system_on_failure="yes"
        fi
-       saved_cppflags="${CPPFLAGS}"
-       saved_libs="${LIBS}"
        if test "${IMAP_TK_DIR}" != "system"; then
                AC_MSG_CHECKING(for UW IMAP Toolkit c-client library)
                if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
@@ -863,8 +863,6 @@ if test "${USE_IMAP_TK}" != "no"; then
        fi
        if test "${ac_cv_imap_tk}" = "yes"; then
                AC_MSG_RESULT(yes)
-               CPPFLAGS="${saved_cppflags}"
-               LIBS="${saved_libs}"
                IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}`
                IMAP_TK_INCLUDE="${imap_include}"
                PBX_IMAP_TK=1
@@ -882,6 +880,8 @@ if test "${USE_IMAP_TK}" != "no"; then
        else
                AC_MSG_RESULT(no)
        fi
+       CPPFLAGS="${saved_cppflags}"
+       LIBS="${saved_libs}"
 fi
 
 # Needed by unixodbc