[svn-commits] mmichelson: trunk r103715 - in /trunk: configure configure.ac

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Feb 15 09:11:23 2008
New Revision: 103715

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103715
Log:
Merging of changes from 1.4 revision 103713.


Modified:
    trunk/configure
    trunk/configure.ac

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=103715&r1=103714&r2=103715
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Feb 15 09:11:23 2008
@@ -648,13 +648,13 @@
 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 @@
 	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 @@
 	else
 		AC_MSG_RESULT(no) 
 	fi
+	CPPFLAGS="${saved_cppflags}"
+	LIBS="${saved_libs}"
 fi
 
 AST_EXT_LIB_CHECK([JACK], [jack], [jack_activate], [jack/jack.h])