From 7bcfc2988d23f1659b451889b1110b7cd8b3eb08 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 26 Jul 2010 21:20:12 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.8@279619 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- configure | 6 +++--- configure.ac | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 200f6fbbc2..b5c9826ca5 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 6fe351a3fa..617277f9f4 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], :)