summaryrefslogtreecommitdiffstats
path: root/scilab/aclocal.m4
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>2012-08-24 09:47:11 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>2012-08-24 09:47:11 +0200
commitd0251540040c2ac7acf4ae9df5877f252cf20fea (patch)
treea06d63feddef3c17b9ba521196710cc385a06bfe /scilab/aclocal.m4
parentbfe5edba0d1cdd8dfb77661a64de6e0dfa42d192 (diff)
parent9e1b924dc51387b955bb03d13982852bb534c09c (diff)
downloadscilab-d0251540040c2ac7acf4ae9df5877f252cf20fea.zip
scilab-d0251540040c2ac7acf4ae9df5877f252cf20fea.tar.gz
Merge remote-tracking branch 'origin/master' into MPI
Change-Id: Ib6813733347d33247af6ad7e9f03a6fd4de8477d
Diffstat (limited to 'scilab/aclocal.m4')
-rw-r--r--scilab/aclocal.m410
1 files changed, 5 insertions, 5 deletions
diff --git a/scilab/aclocal.m4 b/scilab/aclocal.m4
index 6838824..cb8c00c 100644
--- a/scilab/aclocal.m4
+++ b/scilab/aclocal.m4
@@ -1,4 +1,4 @@
1# generated automatically by aclocal 1.11.3 -*- Autoconf -*- 1# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
2 2
3# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 3# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, 4# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -14,8 +14,8 @@
14 14
15m4_ifndef([AC_AUTOCONF_VERSION], 15m4_ifndef([AC_AUTOCONF_VERSION],
16 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 16 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, 17m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
18[m4_warning([this file was generated for autoconf 2.68. 18[m4_warning([this file was generated for autoconf 2.69.
19You have another version of autoconf. It may work, but is not guaranteed to. 19You have another version of autoconf. It may work, but is not guaranteed to.
20If you have problems, you may need to regenerate the build system entirely. 20If you have problems, you may need to regenerate the build system entirely.
21To do so, use the procedure documented by the package, typically `autoreconf'.])]) 21To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -2265,7 +2265,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
2265[am__api_version='1.11' 2265[am__api_version='1.11'
2266dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to 2266dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
2267dnl require some minimum version. Point them to the right macro. 2267dnl require some minimum version. Point them to the right macro.
2268m4_if([$1], [1.11.3], [], 2268m4_if([$1], [1.11.6], [],
2269 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl 2269 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
2270]) 2270])
2271 2271
@@ -2281,7 +2281,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
2281# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. 2281# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
2282# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. 2282# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
2283AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 2283AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
2284[AM_AUTOMAKE_VERSION([1.11.3])dnl 2284[AM_AUTOMAKE_VERSION([1.11.6])dnl
2285m4_ifndef([AC_AUTOCONF_VERSION], 2285m4_ifndef([AC_AUTOCONF_VERSION],
2286 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 2286 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
2287_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) 2287_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])