Merging of changes from 1.4 revision 103713.
[asterisk/asterisk.git] / configure.ac
index 4838de4..073ec0f 100644 (file)
@@ -648,13 +648,13 @@ fi
 AST_EXT_LIB_CHECK([IKSEMEL], [iksemel], [iks_start_sasl], [iksemel.h])
 
 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
@@ -1032,8 +1032,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
@@ -1044,6 +1042,8 @@ if test "${USE_IMAP_TK}" != "no"; then
        else
                AC_MSG_RESULT(no) 
        fi
+       CPPFLAGS="${saved_cppflags}"
+       LIBS="${saved_libs}"
 fi
 
 AST_EXT_LIB_CHECK([JACK], [jack], [jack_activate], [jack/jack.h])