[svn-commits] seanbright: trunk r679 - /trunk/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed Dec 23 10:47:04 2009
New Revision: 679

URL: http://svnview.digium.com/svn/menuselect?view=rev&rev=679
Log:
Merged revisions 678 via svnmerge from 
https://origsvn.digium.com/svn/menuselect/branches/1.0

........
  r678 | seanbright | 2009-12-23 11:46:08 -0500 (Wed, 23 Dec 2009) | 2 lines
  
  Bring in changes to AST_CHECK_GNU_MAKE like those made in the asterisk repos.
........

Modified:
    trunk/   (props changed)
    trunk/acinclude.m4
    trunk/aclocal.m4
    trunk/autoconfig.h.in
    trunk/configure

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.0-merged (original)
+++ branch-1.0-merged Wed Dec 23 10:47:04 2009
@@ -1,1 +1,1 @@
-/branches/1.0:1-316,383,437,465,467,473,475,477,518,676
+/branches/1.0:1-316,383,437,465,467,473,475,477,518,676,678

Modified: trunk/acinclude.m4
URL: http://svnview.digium.com/svn/menuselect/trunk/acinclude.m4?view=diff&rev=679&r1=678&r2=679
==============================================================================
--- trunk/acinclude.m4 (original)
+++ trunk/acinclude.m4 Wed Dec 23 10:47:04 2009
@@ -95,25 +95,25 @@
 
 
 AC_DEFUN(
-[AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK(for GNU make, GNU_MAKE,
-   GNU_MAKE='Not Found' ;
-   GNU_MAKE_VERSION_MAJOR=0 ;
-   GNU_MAKE_VERSION_MINOR=0 ;
+[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 ;
-         GNU_MAKE_VERSION_MAJOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f3 -d' ' | cut -f1 -d'.'`
-         GNU_MAKE_VERSION_MINOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f2 -d'.' | cut -c1-2`
+         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])
 ])
 
 # AST_FUNC_FORK

Modified: trunk/aclocal.m4
URL: http://svnview.digium.com/svn/menuselect/trunk/aclocal.m4?view=diff&rev=679&r1=678&r2=679
==============================================================================
--- trunk/aclocal.m4 (original)
+++ trunk/aclocal.m4 Wed Dec 23 10:47:04 2009
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: trunk/autoconfig.h.in
URL: http://svnview.digium.com/svn/menuselect/trunk/autoconfig.h.in?view=diff&rev=679&r1=678&r2=679
==============================================================================
--- trunk/autoconfig.h.in (original)
+++ trunk/autoconfig.h.in Wed Dec 23 10:47:04 2009
@@ -89,6 +89,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION