Diff for /embedaddon/quagga/aclocal.m4 between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 11:53:40 version 1.1.1.3, 2012/10/09 09:22:28
Line 1 Line 1
# generated automatically by aclocal 1.11.2 -*- Autoconf -*-# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
   
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,  # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
Line 14 Line 14
   
 m4_ifndef([AC_AUTOCONF_VERSION],  m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.68.[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.  You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.  If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])  To do so, use the procedure documented by the package, typically `autoreconf'.])])
Line 38  AC_DEFUN([AM_AUTOMAKE_VERSION], Line 38  AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'  [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to  dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.  dnl require some minimum version.  Point them to the right macro.
m4_if([$1], [1.11.2], [],m4_if([$1], [1.11.5], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])  ])
   
Line 54  m4_define([_AM_AUTOCONF_VERSION], []) Line 54  m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.  # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.  # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.2])dnl[AM_AUTOMAKE_VERSION([1.11.5])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],  m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])  _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
Line 921  AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) Line 921  AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
   
 # Check how to create a tarball.                            -*- Autoconf -*-  # Check how to create a tarball.                            -*- Autoconf -*-
   
# Copyright (C) 2004, 2005  Free Software Foundation, Inc.# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
 #  #
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 943  AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) Line 943  AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # a tarball read from stdin.  # a tarball read from stdin.
 #     $(am__untar) < result.tar  #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],  AC_DEFUN([_AM_PROG_TAR],
[# Always define AMTAR for backward compatibility.[# Always define AMTAR for backward compatibility.  Yes, it's still used
AM_MISSING_PROG([AMTAR], [tar])# in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],  m4_if([$1], [v7],
     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,       [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])                [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])  AC_MSG_CHECKING([how to create a $1 tar archive])

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>