-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
418ae94
commit a737f69
Showing
7 changed files
with
247 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # generated automatically by aclocal 1.13.4 -*- Autoconf -*- | ||
| # generated automatically by aclocal 1.14 -*- Autoconf -*- | ||
|
|
||
| # Copyright (C) 1996-2013 Free Software Foundation, Inc. | ||
|
|
||
|
|
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) | |
| # generated from the m4 files accompanying Automake X.Y. | ||
| # (This private macro should not be called outside this file.) | ||
| AC_DEFUN([AM_AUTOMAKE_VERSION], | ||
| [am__api_version='1.13' | ||
| [am__api_version='1.14' | ||
| 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. | ||
| m4_if([$1], [1.13.4], [], | ||
| m4_if([$1], [1.14], [], | ||
| [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | ||
| ]) | ||
|
|
||
|
|
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) | |
| # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | ||
| # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | ||
| AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | ||
| [AM_AUTOMAKE_VERSION([1.13.4])dnl | ||
| [AM_AUTOMAKE_VERSION([1.14])dnl | ||
| m4_ifndef([AC_AUTOCONF_VERSION], | ||
| [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | ||
| _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | ||
|
|
@@ -438,6 +438,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], | |
| # This macro actually does too much. Some checks are only needed if | ||
| # your package does certain things. But this isn't really a big deal. | ||
|
|
||
| dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. | ||
| m4_define([AC_PROG_CC], | ||
| m4_defn([AC_PROG_CC]) | ||
| [_AM_PROG_CC_C_O | ||
| ]) | ||
|
|
||
| # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) | ||
| # AM_INIT_AUTOMAKE([OPTIONS]) | ||
| # ----------------------------------------------- | ||
|
|
@@ -546,15 +552,55 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. | |
| AC_CONFIG_COMMANDS_PRE(dnl | ||
| [m4_provide_if([_AM_COMPILER_EXEEXT], | ||
| [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl | ||
| ]) | ||
| # POSIX will say in a future version that running "rm -f" with no argument | ||
| # is OK; and we want to be able to make that assumption in our Makefile | ||
| # recipes. So use an aggressive probe to check that the usage we want is | ||
| # actually supported "in the wild" to an acceptable degree. | ||
| # See automake bug#10828. | ||
| # To make any issue more visible, cause the running configure to be aborted | ||
| # by default if the 'rm' program in use doesn't match our expectations; the | ||
| # user can still override this though. | ||
| if rm -f && rm -fr && rm -rf; then : OK; else | ||
| cat >&2 <<'END' | ||
| Oops! | ||
| Your 'rm' program seems unable to run without file operands specified | ||
| on the command line, even when the '-f' option is present. This is contrary | ||
| to the behaviour of most rm programs out there, and not conforming with | ||
| the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> | ||
| Please tell [email protected] about your system, including the value | ||
| of your $PATH and any error possibly output before this message. This | ||
| can help us improve future automake versions. | ||
| END | ||
| if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then | ||
| echo 'Configuration will proceed anyway, since you have set the' >&2 | ||
| echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 | ||
| echo >&2 | ||
| else | ||
| cat >&2 <<'END' | ||
| Aborting the configuration process, to ensure you take notice of the issue. | ||
| You can download and install GNU coreutils to get an 'rm' implementation | ||
| that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||
| If you want to complete the configuration process using your problematic | ||
| 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||
| to "yes", and re-run configure. | ||
| END | ||
| AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) | ||
| fi | ||
| fi]) | ||
|
|
||
| dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | ||
| dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further | ||
| dnl mangled by Autoconf and run in a shell conditional statement. | ||
| m4_define([_AC_COMPILER_EXEEXT], | ||
| m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) | ||
|
|
||
|
|
||
| # When config.status generates a header, we must update the stamp-h file. | ||
| # This file resides in the same directory as the config header | ||
| # that is generated. The stamp files are numbered to have different names. | ||
|
|
@@ -772,6 +818,70 @@ AC_DEFUN([_AM_SET_OPTIONS], | |
| AC_DEFUN([_AM_IF_OPTION], | ||
| [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | ||
|
|
||
| # Copyright (C) 1999-2013 Free Software Foundation, Inc. | ||
| # | ||
| # This file is free software; the Free Software Foundation | ||
| # gives unlimited permission to copy and/or distribute it, | ||
| # with or without modifications, as long as this notice is preserved. | ||
|
|
||
| # _AM_PROG_CC_C_O | ||
| # --------------- | ||
| # Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC | ||
| # to automatically call this. | ||
| AC_DEFUN([_AM_PROG_CC_C_O], | ||
| [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||
| AC_REQUIRE_AUX_FILE([compile])dnl | ||
| AC_LANG_PUSH([C])dnl | ||
| AC_CACHE_CHECK( | ||
| [whether $CC understands -c and -o together], | ||
| [am_cv_prog_cc_c_o], | ||
| [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) | ||
| # Make sure it works both with $CC and with simple cc. | ||
| # Following AC_PROG_CC_C_O, we do the test twice because some | ||
| # compilers refuse to overwrite an existing .o file with -o, | ||
| # though they will create one. | ||
| am_cv_prog_cc_c_o=yes | ||
| for am_i in 1 2; do | ||
| if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ | ||
| && test -f conftest2.$ac_objext; then | ||
| : OK | ||
| else | ||
| am_cv_prog_cc_c_o=no | ||
| break | ||
| fi | ||
| done | ||
| rm -f core conftest* | ||
| unset am_i]) | ||
| if test "$am_cv_prog_cc_c_o" != yes; then | ||
| # Losing compiler, so override with the script. | ||
| # FIXME: It is wrong to rewrite CC. | ||
| # But if we don't then we get into trouble of one sort or another. | ||
| # A longer-term fix would be to have automake use am__CC in this case, | ||
| # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" | ||
| CC="$am_aux_dir/compile $CC" | ||
| fi | ||
| AC_LANG_POP([C])]) | ||
|
|
||
| # For backward compatibility. | ||
| AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) | ||
|
|
||
| # Copyright (C) 2001-2013 Free Software Foundation, Inc. | ||
| # | ||
| # This file is free software; the Free Software Foundation | ||
| # gives unlimited permission to copy and/or distribute it, | ||
| # with or without modifications, as long as this notice is preserved. | ||
|
|
||
| # AM_RUN_LOG(COMMAND) | ||
| # ------------------- | ||
| # Run COMMAND, save the exit status in ac_status, and log it. | ||
| # (This has been adapted from Autoconf's _AC_RUN_LOG macro.) | ||
| AC_DEFUN([AM_RUN_LOG], | ||
| [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD | ||
| ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD | ||
| ac_status=$? | ||
| echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | ||
| (exit $ac_status); }]) | ||
|
|
||
| # Check to make sure that the build environment is sane. -*- Autoconf -*- | ||
|
|
||
| # Copyright (C) 1996-2013 Free Software Foundation, Inc. | ||
|
|
||
Oops, something went wrong.