dect
/
asterisk
Archived
13
0
Fork 0

Merged revisions 279619 via svnmerge from

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: http://svn.digium.com/svn/asterisk/trunk@279624 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
tilghman 2010-07-26 21:21:23 +00:00
parent f6b9ca8a95
commit e892e629bb
2 changed files with 5 additions and 5 deletions

6
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 279533 .
# From configure.ac Revision: 279564 .
# 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

View File

@ -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], :)