[asterisk-commits] pcadach: branch pcadach/chan_h323-live r40176 - /team/pcadach/chan_h323-live/

[asterisk-commits at lists.digium.com]

Author: pcadach
Date: Thu Aug 17 03:13:39 2006
New Revision: 40176

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

........
r40153 | russell | 2006-08-17 12:16:00 +0600 (Чтв, 17 Авг 2006) | 5 lines

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 :)

........
r40154 | russell | 2006-08-17 12:18:42 +0600 (Чтв, 17 Авг 2006) | 2 lines

tabs to spaces to fix alignment ...

........

Modified:
    team/pcadach/chan_h323-live/   (props changed)
    team/pcadach/chan_h323-live/acinclude.m4
    team/pcadach/chan_h323-live/configure
    team/pcadach/chan_h323-live/configure.ac

Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 17 03:13:39 2006
@@ -1,1 +1,1 @@
-/trunk:1-40150
+/trunk:1-40175

Modified: team/pcadach/chan_h323-live/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/acinclude.m4?rev=40176&r1=40175&r2=40176&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/acinclude.m4 (original)
+++ team/pcadach/chan_h323-live/acinclude.m4 Thu Aug 17 03:13:39 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: team/pcadach/chan_h323-live/configure
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure?rev=40176&r1=40175&r2=40176&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure (original)
+++ team/pcadach/chan_h323-live/configure Thu Aug 17 03:13:39 2006
@@ -4237,10 +4237,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 ;
@@ -26211,3 +26215,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: team/pcadach/chan_h323-live/configure.ac
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure.ac?rev=40176&r1=40175&r2=40176&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure.ac (original)
+++ team/pcadach/chan_h323-live/configure.ac Thu Aug 17 03:13:39 2006
@@ -942,3 +942,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