kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 279619 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r279619 | tilghman | 2010-07-26 16:20:12 -0500 (Mon, 26 Jul 2010) | 9 lines
  
  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/trunk@279624 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-07-26 21:21:23 +00:00
parent 12a0639429
commit 05a0a0538a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 279533 . # From configure.ac Revision: 279564 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk trunk. # 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 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 else
$LN_S -f sounds/Makefile.380 sounds/Makefile $LN_S -f Makefile.380 sounds/Makefile
fi fi
if test -n "$ac_tool_prefix"; then if test -n "$ac_tool_prefix"; then

4
configure.ac
View File

@@ -177,9 +177,9 @@ AC_PROG_RANLIB
AST_CHECK_GNU_MAKE AST_CHECK_GNU_MAKE
if test ${ac_cv_GNU_MAKE_VERSION_MAJOR} -gt 2 -a ${ac_cv_GNU_MAKE_VERSION_MINOR} -gt 80; then 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 else
$LN_S -f sounds/Makefile.380 sounds/Makefile $LN_S -f Makefile.380 sounds/Makefile
fi fi
AC_CHECK_TOOLS([STRIP], [strip gstrip], :) AC_CHECK_TOOLS([STRIP], [strip gstrip], :)