aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-04 19:31:33 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-04 19:31:33 +0000
commit86849e1951c5359980955ed796e7e7d6402f4590 (patch)
treed5c8c9e4b9bf7ebe21adf13da6cdced73fcbeba0 /configure
parent1a7f76fbc7b8ade491570d26cc4b5cb01777fbe5 (diff)
Merged 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.2@192173 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure32
1 files changed, 16 insertions, 16 deletions
diff --git a/configure b/configure
index 9f6335783..effbcddf3 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 190096 .
+# From configure.ac Revision: 191370 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
#
@@ -36504,8 +36504,8 @@ fi
fi
CPPFLAGS="${CPPFLAGS} ${LIBXML2_INCLUDE}"
- saved_ldflags="${LDFLAGS}"
- LDFLAGS="${LIBXML2_LIB}"
+ saved_libs="${LIBS}"
+ LIBS="${LIBXML2_LIB}"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -36560,7 +36560,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_LIBXML2=1
@@ -38298,8 +38298,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. */
@@ -38355,7 +38355,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
@@ -48714,8 +48714,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. */
@@ -48769,7 +48769,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
@@ -51777,8 +51777,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. */
@@ -51832,7 +51832,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
@@ -53173,8 +53173,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. */
@@ -53228,7 +53228,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