diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-04 19:30:34 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-04 19:30:34 +0000 |
| commit | 185024f0f995728d7f18d489c5e8cff16d605e81 (patch) | |
| tree | aedf78cd4dcf4e166649b65dfb9d0d9a6d06cf7f /configure | |
| parent | afd79973ae1fedd5ad132ba221e29e76fb32f336 (diff) | |
Recorded merge of revisions 192171 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r192171 | tilghman | 2009-05-04 14:29:13 -0500 (Mon, 04 May 2009) | 8 lines
Restore 'asyncagi break' command to 1.6.1 and higher.
(closes issue #14985)
Reported by: nikkk
Patches:
20090428__bug14985.diff.txt uploaded by tilghman (license 14)
20090429__bug14985__1.6.1.diff.txt uploaded by tilghman (license 14)
Tested by: nikkk
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@192172 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 190095 . +# From configure.ac Revision: 191369 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -36302,8 +36302,8 @@ fi fi CPPFLAGS="${CPPFLAGS} ${NETSNMP_INCLUDE}" - saved_ldflags="${LDFLAGS}" - LDFLAGS="${NETSNMP_LIB}" + saved_libs="${LIBS}" + LIBS="${NETSNMP_LIB}" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -36359,7 +36359,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" - LDFLAGS="${saved_ldflags}" + LIBS="${saved_libs}" else PBX_NETSNMP=1 @@ -46194,8 +46194,8 @@ fi fi CPPFLAGS="${CPPFLAGS} ${GMIME_INCLUDE}" - saved_ldflags="${LDFLAGS}" - LDFLAGS="${GMIME_LIB}" + saved_libs="${LIBS}" + LIBS="${GMIME_LIB}" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -46249,7 +46249,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" - LDFLAGS="${saved_ldflags}" + LIBS="${saved_libs}" else PBX_GMIME=1 @@ -48992,8 +48992,8 @@ fi fi CPPFLAGS="${CPPFLAGS} ${SDL_INCLUDE}" - saved_ldflags="${LDFLAGS}" - LDFLAGS="${SDL_LIB}" + saved_libs="${LIBS}" + LIBS="${SDL_LIB}" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -49047,7 +49047,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" - LDFLAGS="${saved_ldflags}" + LIBS="${saved_libs}" else PBX_SDL=1 @@ -50388,8 +50388,8 @@ fi fi CPPFLAGS="${CPPFLAGS} ${GTK_INCLUDE}" - saved_ldflags="${LDFLAGS}" - LDFLAGS="${GTK_LIB}" + saved_libs="${LIBS}" + LIBS="${GTK_LIB}" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -50443,7 +50443,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" - LDFLAGS="${saved_ldflags}" + LIBS="${saved_libs}" else PBX_GTK=1 |