Merging of changes from 1.4 revision 103713.

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

diff --git a/configure b/configure
index 0e63086a8b92b0ac7cc8057aab03cdf321f51b46..d4afaaeae48770a0219a0a97ce45519510bdccad 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 103700 .
+# From configure.ac Revision: 103711 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -32477,13 +32477,13 @@ 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; }
@@ -33087,8 +33087,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
@@ -33108,6 +33106,8 @@ _ACEOF
                { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
        fi
+       CPPFLAGS="${saved_cppflags}"
+       LIBS="${saved_libs}"
 fi
 
 

diff --git a/configure.ac b/configure.ac
index 4838de4d8dbd11498f8d422fd1a6529a5b4d9369..073ec0fa452f20bf98114d684ed99be8cad39bb3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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])