diff options
| author | Mark Michelson <mmichelson@digium.com> | 2008-02-15 15:11:23 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2008-02-15 15:11:23 +0000 |
| commit | cd7f33a39f9a9c631dc59e0a719149d46e5c7666 (patch) | |
| tree | f58919b71477059067309a1a430060d4336ddb62 /configure | |
| parent | 4f973e284c913d21fdcdad7fb725ce7f4d957b25 (diff) | |
Merging of changes from 1.4 revision 103713.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103715 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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 |