aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-26 21:20:12 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-26 21:20:12 +0000
commit4568a881f98f1be43e142357f5e9b25f24464ba5 (patch)
tree43e27c5786548a5f70b97e823391e3ebca114039
parent5ce0e42880f7eddfb8fc6adb31ed3d4399dbc10d (diff)
Merged revisions 279609 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r279609 | tilghman | 2010-07-26 16:18:17 -0500 (Mon, 26 Jul 2010) | 2 lines Dunno why this worked on my machine, but it works better this way. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@279619 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xconfigure6
-rw-r--r--configure.ac4
2 files changed, 5 insertions, 5 deletions
diff --git a/configure b/configure
index 200f6fbbc..b5c9826ca 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 279504 .
+# From configure.ac Revision: 279562 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk trunk.
#
@@ -6826,9 +6826,9 @@ GNU_MAKE=$ac_cv_GNU_MAKE
if test ${ac_cv_GNU_MAKE_VERSION_MAJOR} -gt 2 -a ${ac_cv_GNU_MAKE_VERSION_MINOR} -gt 80; then
- $LN_S -f sounds/Makefile.381 sounds/Makefile
+ $LN_S -f Makefile.381 sounds/Makefile
else
- $LN_S -f sounds/Makefile.380 sounds/Makefile
+ $LN_S -f Makefile.380 sounds/Makefile
fi
if test -n "$ac_tool_prefix"; then
diff --git a/configure.ac b/configure.ac
index 6fe351a3f..617277f9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,9 +177,9 @@ AC_PROG_RANLIB
AST_CHECK_GNU_MAKE
if test ${ac_cv_GNU_MAKE_VERSION_MAJOR} -gt 2 -a ${ac_cv_GNU_MAKE_VERSION_MINOR} -gt 80; then
- $LN_S -f sounds/Makefile.381 sounds/Makefile
+ $LN_S -f Makefile.381 sounds/Makefile
else
- $LN_S -f sounds/Makefile.380 sounds/Makefile
+ $LN_S -f Makefile.380 sounds/Makefile
fi
AC_CHECK_TOOLS([STRIP], [strip gstrip], :)