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: https://origsvn.digium.com/svn/asterisk/trunk@279624 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index 205866649e57173777c5356536e504e9d88e93e1..31a73454c04b10c89251f1aad9807c90204a23f0 100755 (executable)
--- a/configure
+++ b/configure
@@ -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

diff --git a/configure.ac b/configure.ac
index 6fe351a3fa71aff1d73eaf7d5140fd6513a87398..617277f9f41537dd7e00c8fcc8814fe6ce5ecd6f 100644 (file)
--- 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], :)