summaryrefslogtreecommitdiffstats
path: root/scilab/aclocal.m4
diff options
context:
space:
mode:
authorCedric Delamarre <cedric.delamarre@scilab-enterprises.com>2013-10-14 15:44:25 +0200
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>2013-10-15 10:01:45 +0200
commit0c2774adc1f4b10706527598eef459a4c4586ab4 (patch)
treec8e4528f3e185afedb5a700a4975a8d6fdf6a30a /scilab/aclocal.m4
parent07171b315182687e7cf75a856129f2b7a46df7f8 (diff)
parentc4fa8db4c4e207ee89a0b5cd8cd5b66b788dee39 (diff)
downloadscilab-0c2774adc1f4b10706527598eef459a4c4586ab4.zip
scilab-0c2774adc1f4b10706527598eef459a4c4586ab4.tar.gz
Merge remote-tracking branch 'origin/master' into YaSp
Conflicts: scilab/configure scilab/modules/double/Makefile.in scilab/modules/graphics/sci_gateway/c/sci_xset.c scilab/modules/intersci/Makefile.in scilab/modules/mexlib/Makefile.in scilab/modules/polynomials/Makefile.in scilab/modules/sparse/Makefile.in scilab/modules/umfpack/Makefile.am scilab/modules/umfpack/Makefile.in Change-Id: I13c0591de448fa96478bf65b0323f89cdfb248ac
Diffstat (limited to 'scilab/aclocal.m4')
-rw-r--r--scilab/aclocal.m4159
1 files changed, 119 insertions, 40 deletions
diff --git a/scilab/aclocal.m4 b/scilab/aclocal.m4
index f05fbb1..c0d8011 100644
--- a/scilab/aclocal.m4
+++ b/scilab/aclocal.m4
@@ -1,4 +1,4 @@
1# generated automatically by aclocal 1.13.3 -*- Autoconf -*- 1# generated automatically by aclocal 1.14 -*- Autoconf -*-
2 2
3# Copyright (C) 1996-2013 Free Software Foundation, Inc. 3# Copyright (C) 1996-2013 Free Software Foundation, Inc.
4 4
@@ -2259,10 +2259,10 @@ AC_SUBST([$1])dnl
2259# generated from the m4 files accompanying Automake X.Y. 2259# generated from the m4 files accompanying Automake X.Y.
2260# (This private macro should not be called outside this file.) 2260# (This private macro should not be called outside this file.)
2261AC_DEFUN([AM_AUTOMAKE_VERSION], 2261AC_DEFUN([AM_AUTOMAKE_VERSION],
2262[am__api_version='1.13' 2262[am__api_version='1.14'
2263dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to 2263dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
2264dnl require some minimum version. Point them to the right macro. 2264dnl require some minimum version. Point them to the right macro.
2265m4_if([$1], [1.13.3], [], 2265m4_if([$1], [1.14], [],
2266 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl 2266 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
2267]) 2267])
2268 2268
@@ -2278,7 +2278,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
2278# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. 2278# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
2279# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. 2279# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
2280AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 2280AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
2281[AM_AUTOMAKE_VERSION([1.13.3])dnl 2281[AM_AUTOMAKE_VERSION([1.14])dnl
2282m4_ifndef([AC_AUTOCONF_VERSION], 2282m4_ifndef([AC_AUTOCONF_VERSION],
2283 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 2283 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
2284_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) 2284_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -2303,7 +2303,8 @@ AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
2303: ${AR=ar} 2303: ${AR=ar}
2304 2304
2305AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], 2305AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
2306 [am_cv_ar_interface=ar 2306 [AC_LANG_PUSH([C])
2307 am_cv_ar_interface=ar
2307 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], 2308 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
2308 [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' 2309 [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
2309 AC_TRY_EVAL([am_ar_try]) 2310 AC_TRY_EVAL([am_ar_try])
@@ -2320,7 +2321,7 @@ AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
2320 fi 2321 fi
2321 rm -f conftest.lib libconftest.a 2322 rm -f conftest.lib libconftest.a
2322 ]) 2323 ])
2323 ]) 2324 AC_LANG_POP([C])])
2324 2325
2325case $am_cv_ar_interface in 2326case $am_cv_ar_interface in
2326ar) 2327ar)
@@ -2704,6 +2705,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
2704# This macro actually does too much. Some checks are only needed if 2705# This macro actually does too much. Some checks are only needed if
2705# your package does certain things. But this isn't really a big deal. 2706# your package does certain things. But this isn't really a big deal.
2706 2707
2708dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
2709m4_define([AC_PROG_CC],
2710m4_defn([AC_PROG_CC])
2711[_AM_PROG_CC_C_O
2712])
2713
2707# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) 2714# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
2708# AM_INIT_AUTOMAKE([OPTIONS]) 2715# AM_INIT_AUTOMAKE([OPTIONS])
2709# ----------------------------------------------- 2716# -----------------------------------------------
@@ -2812,7 +2819,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
2812AC_CONFIG_COMMANDS_PRE(dnl 2819AC_CONFIG_COMMANDS_PRE(dnl
2813[m4_provide_if([_AM_COMPILER_EXEEXT], 2820[m4_provide_if([_AM_COMPILER_EXEEXT],
2814 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl 2821 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
2815]) 2822
2823# POSIX will say in a future version that running "rm -f" with no argument
2824# is OK; and we want to be able to make that assumption in our Makefile
2825# recipes. So use an aggressive probe to check that the usage we want is
2826# actually supported "in the wild" to an acceptable degree.
2827# See automake bug#10828.
2828# To make any issue more visible, cause the running configure to be aborted
2829# by default if the 'rm' program in use doesn't match our expectations; the
2830# user can still override this though.
2831if rm -f && rm -fr && rm -rf; then : OK; else
2832 cat >&2 <<'END'
2833Oops!
2834
2835Your 'rm' program seems unable to run without file operands specified
2836on the command line, even when the '-f' option is present. This is contrary
2837to the behaviour of most rm programs out there, and not conforming with
2838the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
2839
2840Please tell bug-automake@gnu.org about your system, including the value
2841of your $PATH and any error possibly output before this message. This
2842can help us improve future automake versions.
2843
2844END
2845 if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
2846 echo 'Configuration will proceed anyway, since you have set the' >&2
2847 echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
2848 echo >&2
2849 else
2850 cat >&2 <<'END'
2851Aborting the configuration process, to ensure you take notice of the issue.
2852
2853You can download and install GNU coreutils to get an 'rm' implementation
2854that behaves properly: <http://www.gnu.org/software/coreutils/>.
2855
2856If you want to complete the configuration process using your problematic
2857'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
2858to "yes", and re-run configure.
2859
2860END
2861 AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
2862 fi
2863fi])
2816 2864
2817dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not 2865dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
2818dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further 2866dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -2820,7 +2868,6 @@ dnl mangled by Autoconf and run in a shell conditional statement.
2820m4_define([_AC_COMPILER_EXEEXT], 2868m4_define([_AC_COMPILER_EXEEXT],
2821m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) 2869m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
2822 2870
2823
2824# When config.status generates a header, we must update the stamp-h file. 2871# When config.status generates a header, we must update the stamp-h file.
2825# This file resides in the same directory as the config header 2872# This file resides in the same directory as the config header
2826# that is generated. The stamp files are numbered to have different names. 2873# that is generated. The stamp files are numbered to have different names.
@@ -2968,38 +3015,6 @@ AC_MSG_RESULT([$_am_result])
2968rm -f confinc confmf 3015rm -f confinc confmf
2969]) 3016])
2970 3017
2971# Copyright (C) 1999-2013 Free Software Foundation, Inc.
2972#
2973# This file is free software; the Free Software Foundation
2974# gives unlimited permission to copy and/or distribute it,
2975# with or without modifications, as long as this notice is preserved.
2976
2977# AM_PROG_CC_C_O
2978# --------------
2979# Like AC_PROG_CC_C_O, but changed for automake.
2980AC_DEFUN([AM_PROG_CC_C_O],
2981[AC_REQUIRE([AC_PROG_CC_C_O])dnl
2982AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
2983AC_REQUIRE_AUX_FILE([compile])dnl
2984# FIXME: we rely on the cache variable name because
2985# there is no other way.
2986set dummy $CC
2987am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
2988eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
2989if test "$am_t" != yes; then
2990 # Losing compiler, so override with the script.
2991 # FIXME: It is wrong to rewrite CC.
2992 # But if we don't then we get into trouble of one sort or another.
2993 # A longer-term fix would be to have automake use am__CC in this case,
2994 # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
2995 CC="$am_aux_dir/compile $CC"
2996fi
2997dnl Make sure AC_PROG_CC is never called again, or it will override our
2998dnl setting of CC.
2999m4_define([AC_PROG_CC],
3000 [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
3001])
3002
3003# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- 3018# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
3004 3019
3005# Copyright (C) 1997-2013 Free Software Foundation, Inc. 3020# Copyright (C) 1997-2013 Free Software Foundation, Inc.
@@ -3102,6 +3117,70 @@ AC_DEFUN([_AM_SET_OPTIONS],
3102AC_DEFUN([_AM_IF_OPTION], 3117AC_DEFUN([_AM_IF_OPTION],
3103[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) 3118[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
3104 3119
3120# Copyright (C) 1999-2013 Free Software Foundation, Inc.
3121#
3122# This file is free software; the Free Software Foundation
3123# gives unlimited permission to copy and/or distribute it,
3124# with or without modifications, as long as this notice is preserved.
3125
3126# _AM_PROG_CC_C_O
3127# ---------------
3128# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
3129# to automatically call this.
3130AC_DEFUN([_AM_PROG_CC_C_O],
3131[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
3132AC_REQUIRE_AUX_FILE([compile])dnl
3133AC_LANG_PUSH([C])dnl
3134AC_CACHE_CHECK(
3135 [whether $CC understands -c and -o together],
3136 [am_cv_prog_cc_c_o],
3137 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
3138 # Make sure it works both with $CC and with simple cc.
3139 # Following AC_PROG_CC_C_O, we do the test twice because some
3140 # compilers refuse to overwrite an existing .o file with -o,
3141 # though they will create one.
3142 am_cv_prog_cc_c_o=yes
3143 for am_i in 1 2; do
3144 if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
3145 && test -f conftest2.$ac_objext; then
3146 : OK
3147 else
3148 am_cv_prog_cc_c_o=no
3149 break
3150 fi
3151 done
3152 rm -f core conftest*
3153 unset am_i])
3154if test "$am_cv_prog_cc_c_o" != yes; then
3155 # Losing compiler, so override with the script.
3156 # FIXME: It is wrong to rewrite CC.
3157 # But if we don't then we get into trouble of one sort or another.
3158 # A longer-term fix would be to have automake use am__CC in this case,
3159 # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
3160 CC="$am_aux_dir/compile $CC"
3161fi
3162AC_LANG_POP([C])])
3163
3164# For backward compatibility.
3165AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
3166
3167# Copyright (C) 2001-2013 Free Software Foundation, Inc.
3168#
3169# This file is free software; the Free Software Foundation
3170# gives unlimited permission to copy and/or distribute it,
3171# with or without modifications, as long as this notice is preserved.
3172
3173# AM_RUN_LOG(COMMAND)
3174# -------------------
3175# Run COMMAND, save the exit status in ac_status, and log it.
3176# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
3177AC_DEFUN([AM_RUN_LOG],
3178[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
3179 ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
3180 ac_status=$?
3181 echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
3182 (exit $ac_status); }])
3183
3105# Check to make sure that the build environment is sane. -*- Autoconf -*- 3184# Check to make sure that the build environment is sane. -*- Autoconf -*-
3106 3185
3107# Copyright (C) 1996-2013 Free Software Foundation, Inc. 3186# Copyright (C) 1996-2013 Free Software Foundation, Inc.