[svn-commits] kpfleming: branch 1.6.0 r888 - /branches/1.6.0/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Mon Apr 27 14:50:21 2009
New Revision: 888

URL: http://svn.digium.com/svn-view/asterisk-addons?view=rev&rev=888
Log:
Merged revisions 887 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/trunk

................
  r887 | kpfleming | 2009-04-27 14:49:45 -0500 (Mon, 27 Apr 2009) | 11 lines
  
  Merged revisions 886 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk-addons/branches/1.4
  
  ........
    r886 | kpfleming | 2009-04-27 14:48:31 -0500 (Mon, 27 Apr 2009) | 5 lines
    
    Incorporate autoconf 2.63 related fixes to configure script
    
    (see revision 190721 of the asterisk repository for more details)
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/acinclude.m4
    branches/1.6.0/aclocal.m4
    branches/1.6.0/configure   (contents, props changed)

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Mon Apr 27 14:50:21 2009
@@ -1,1 +1,1 @@
-/trunk:540-559,575,579,583,586,588,590,592,594,603,607,612,615,617,627,647,653,659,662,707,715,719,725-726,730
+/trunk:540-559,575,579,583,586,588,590,592,594,603,607,612,615,617,627,647,653,659,662,707,715,719,725-726,730,887

Modified: branches/1.6.0/acinclude.m4
URL: http://svn.digium.com/svn-view/asterisk-addons/branches/1.6.0/acinclude.m4?view=diff&rev=888&r1=887&r2=888
==============================================================================
--- branches/1.6.0/acinclude.m4 (original)
+++ branches/1.6.0/acinclude.m4 Mon Apr 27 14:50:21 2009
@@ -80,21 +80,23 @@
 fi
 ])
 
-
-AC_DEFUN(
-[AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK(for GNU make, GNU_MAKE,
-   GNU_MAKE='Not Found' ;
+AC_DEFUN([AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK([for GNU make], [ac_cv_GNU_MAKE],
+   ac_cv_GNU_MAKE='Not Found' ;
+   ac_cv_GNU_MAKE_VERSION_MAJOR=0 ;
+   ac_cv_GNU_MAKE_VERSION_MINOR=0 ;
    for a in make gmake gnumake ; do
       if test -z "$a" ; then continue ; fi ;
       if ( sh -c "$a --version" 2> /dev/null | grep GNU  2>&1 > /dev/null ) ;  then
-         GNU_MAKE=$a ;
+         ac_cv_GNU_MAKE=$a ;
+         ac_cv_GNU_MAKE_VERSION_MAJOR=`$ac_cv_GNU_MAKE --version | grep "GNU Make" | cut -f3 -d' ' | cut -f1 -d'.'`
+         ac_cv_GNU_MAKE_VERSION_MINOR=`$ac_cv_GNU_MAKE --version | grep "GNU Make" | cut -f2 -d'.' | cut -c1-2`
          break;
       fi
    done ;
 ) ;
-if test  "x$GNU_MAKE" = "xNot Found"  ; then
+if test  "x$ac_cv_GNU_MAKE" = "xNot Found"  ; then
    AC_MSG_ERROR( *** Please install GNU make.  It is required to build Asterisk!)
    exit 1
 fi
-AC_SUBST([GNU_MAKE])
+AC_SUBST([GNU_MAKE], [$ac_cv_GNU_MAKE])
 ])

Modified: branches/1.6.0/aclocal.m4
URL: http://svn.digium.com/svn-view/asterisk-addons/branches/1.6.0/aclocal.m4?view=diff&rev=888&r1=887&r2=888
==============================================================================
--- branches/1.6.0/aclocal.m4 (original)
+++ branches/1.6.0/aclocal.m4 Mon Apr 27 14:50:21 2009
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008  Free Software Foundation, Inc.

Propchange: branches/1.6.0/configure
            ('svn:eol-style' removed)

Propchange: branches/1.6.0/configure
            ('svn:keywords' removed)

Propchange: branches/1.6.0/configure
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Mon Apr 27 14:50:21 2009
@@ -1,1 +1,1 @@
-text/plain
+application/octet-stream