[asterisk-commits] russell: trunk r40153 - in /trunk: acinclude.m4 configure configure.ac

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Aug 17 01:16:00 2006
New Revision: 40153

URL: http://svn.digium.com/view/asterisk?rev=40153&view=rev
Log:
print a warning at the end of the configure script if the version of GNU Make
in use is a version earlier than 3.81

This is for file :)

Modified:
    trunk/acinclude.m4
    trunk/configure
    trunk/configure.ac

Modified: trunk/acinclude.m4
URL: http://svn.digium.com/view/asterisk/trunk/acinclude.m4?rev=40153&r1=40152&r2=40153&view=diff
==============================================================================
--- trunk/acinclude.m4 (original)
+++ trunk/acinclude.m4 Thu Aug 17 01:16:00 2006
@@ -84,10 +84,14 @@
 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 ;
    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'.'`
          break;
       fi
    done ;

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?rev=40153&r1=40152&r2=40153&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Thu Aug 17 01:16:00 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 37678 .
+# From configure.ac Revision: 39615 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60.
 #
@@ -5148,10 +5148,14 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   GNU_MAKE='Not Found' ;
+   GNU_MAKE_VERSION_MAJOR=0 ;
+   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'.'`
          break;
       fi
    done ;
@@ -29090,3 +29094,20 @@
    { echo "$as_me:$LINENO: Target            = ${host}" >&5
 echo "$as_me: Target            = ${host}" >&6;}
 fi
+
+if test ${GNU_MAKE_VERSION_MAJOR} -lt 3 || test ${GNU_MAKE_VERSION_MINOR} -lt 81 ; then
+   { echo "$as_me:$LINENO: " >&5
+echo "$as_me: " >&6;}
+   { echo "$as_me:$LINENO: ***** WARNING ******" >&5
+echo "$as_me: ***** WARNING ******" >&6;}
+   { echo "$as_me:$LINENO: You are currently using GNU Make version ${GNU_MAKE_VERSION_MAJOR}.${GNU_MAKE_VERSION_MINOR}." >&5
+echo "$as_me: You are currently using GNU Make version ${GNU_MAKE_VERSION_MAJOR}.${GNU_MAKE_VERSION_MINOR}." >&6;}
+   { echo "$as_me:$LINENO: The Asterisk build system uses features that may not work correctly prior to 3.81." >&5
+echo "$as_me: The Asterisk build system uses features that may not work correctly prior to 3.81." >&6;}
+   { echo "$as_me:$LINENO: Please consider upgrading GNU Make or you may experience problems." >&5
+echo "$as_me: Please consider upgrading GNU Make or you may experience problems." >&6;}
+   { echo "$as_me:$LINENO: ********************" >&5
+echo "$as_me: ********************" >&6;}
+   { echo "$as_me:$LINENO: " >&5
+echo "$as_me: " >&6;}
+fi

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?rev=40153&r1=40152&r2=40153&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Aug 17 01:16:00 2006
@@ -932,3 +932,13 @@
    AC_MSG_NOTICE( Cross Compilation = YES)
    AC_MSG_NOTICE( Target            = ${host})
 fi
+
+if test ${GNU_MAKE_VERSION_MAJOR} -lt 3 || test ${GNU_MAKE_VERSION_MINOR} -lt 81 ; then
+   AC_MSG_NOTICE()
+   AC_MSG_NOTICE(***** WARNING ******)
+   AC_MSG_NOTICE(You are currently using GNU Make version ${GNU_MAKE_VERSION_MAJOR}.${GNU_MAKE_VERSION_MINOR}.)
+   AC_MSG_NOTICE(The Asterisk build system uses features that may not work correctly prior to 3.81.)
+   AC_MSG_NOTICE(Please consider upgrading GNU Make or you may experience problems.)
+   AC_MSG_NOTICE(********************)
+   AC_MSG_NOTICE()
+fi