1
- # generated automatically by aclocal 1.13.4 -*- Autoconf -*-
1
+ # generated automatically by aclocal 1.14.1 -*- Autoconf -*-
2
2
3
3
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
4
4
@@ -1326,7 +1326,7 @@ ia64-*-hpux*)
1326
1326
rm -rf conftest*
1327
1327
;;
1328
1328
1329
- x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
1329
+ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*| powerpc*-*linux*| \
1330
1330
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
1331
1331
# Find out which ABI we are using.
1332
1332
echo 'int i;' > conftest.$ac_ext
@@ -1340,10 +1340,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
1340
1340
x86_64-*linux*)
1341
1341
LD="${LD-ld} -m elf_i386"
1342
1342
;;
1343
- powerpc64le-*linux*)
1344
- LD="${LD-ld} -m elf32lppclinux"
1345
- ;;
1346
- powerpc64-*linux*)
1343
+ ppc64-*linux*|powerpc64-*linux*)
1347
1344
LD="${LD-ld} -m elf32ppclinux"
1348
1345
;;
1349
1346
s390x-*linux*)
@@ -1362,10 +1359,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
1362
1359
x86_64-*linux*)
1363
1360
LD="${LD-ld} -m elf_x86_64"
1364
1361
;;
1365
- powerpcle-*linux*)
1366
- LD="${LD-ld} -m elf64lppc"
1367
- ;;
1368
- powerpc-*linux*)
1362
+ ppc*-*linux*|powerpc*-*linux*)
1369
1363
LD="${LD-ld} -m elf64ppc"
1370
1364
;;
1371
1365
s390*-*linux*|s390*-*tpf*)
@@ -2689,14 +2683,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
2689
2683
# before this can be enabled.
2690
2684
hardcode_into_libs=yes
2691
2685
2692
- # Add ABI-specific directories to the system library path.
2693
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
2694
-
2695
2686
# Append ld.so.conf contents to the search path
2696
2687
if test -f /etc/ld.so.conf; then
2697
2688
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[ $] 2)); skip = 1; } { if (!skip) print \[ $] 0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ] *hwcap[ ] /d;s/[ :, ] / /g;s/=[ ^=] *$//;s/=[ ^= ] * / /g;s/"//g;/^$/d' | tr '\n' ' '`
2698
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
2699
-
2689
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
2700
2690
fi
2701
2691
2702
2692
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -8629,10 +8619,10 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
8629
8619
# generated from the m4 files accompanying Automake X.Y.
8630
8620
# (This private macro should not be called outside this file.)
8631
8621
AC_DEFUN ( [ AM_AUTOMAKE_VERSION] ,
8632
- [ am__api_version='1.13 '
8622
+ [ am__api_version='1.14 '
8633
8623
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
8634
8624
dnl require some minimum version. Point them to the right macro.
8635
- m4_if ( [ $1 ] , [ 1.13.4 ] , [ ] ,
8625
+ m4_if ( [ $1 ] , [ 1.14.1 ] , [ ] ,
8636
8626
[ AC_FATAL ( [ Do not call $0 , use AM_INIT_AUTOMAKE ( [ $1 ] ) .] ) ] ) dnl
8637
8627
] )
8638
8628
@@ -8648,7 +8638,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
8648
8638
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
8649
8639
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
8650
8640
AC_DEFUN ( [ AM_SET_CURRENT_AUTOMAKE_VERSION] ,
8651
- [ AM_AUTOMAKE_VERSION([ 1.13.4 ] )dnl
8641
+ [ AM_AUTOMAKE_VERSION([ 1.14.1 ] )dnl
8652
8642
m4_ifndef ( [ AC_AUTOCONF_VERSION ] ,
8653
8643
[ m4_copy ( [ m4_PACKAGE_VERSION] , [ AC_AUTOCONF_VERSION ] ) ] ) dnl
8654
8644
_AM_AUTOCONF_VERSION(m4_defn ( [ AC_AUTOCONF_VERSION ] ) )] )
@@ -9015,6 +9005,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
9015
9005
# This macro actually does too much. Some checks are only needed if
9016
9006
# your package does certain things. But this isn't really a big deal.
9017
9007
9008
+ dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
9009
+ m4_define ( [ AC_PROG_CC ] ,
9010
+ m4_defn ( [ AC_PROG_CC ] )
9011
+ [ _AM_PROG_CC_C_O
9012
+ ] )
9013
+
9018
9014
# AM_INIT_AUTOMAKE ( PACKAGE , VERSION , [ NO-DEFINE] )
9019
9015
# AM_INIT_AUTOMAKE ( [ OPTIONS] )
9020
9016
# -----------------------------------------------
@@ -9123,15 +9119,55 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
9123
9119
AC_CONFIG_COMMANDS_PRE ( dnl
9124
9120
[ m4_provide_if([ _AM_COMPILER_EXEEXT] ,
9125
9121
[ AM_CONDITIONAL([ am__EXEEXT] , [ test -n "$EXEEXT"] )] )] ) dnl
9126
- ] )
9122
+
9123
+ # POSIX will say in a future version that running "rm -f" with no argument
9124
+ # is OK; and we want to be able to make that assumption in our Makefile
9125
+ # recipes. So use an aggressive probe to check that the usage we want is
9126
+ # actually supported "in the wild" to an acceptable degree.
9127
+ # See automake bug#10828.
9128
+ # To make any issue more visible, cause the running configure to be aborted
9129
+ # by default if the 'rm' program in use doesn't match our expectations; the
9130
+ # user can still override this though.
9131
+ if rm -f && rm -fr && rm -rf; then : OK; else
9132
+ cat >&2 <<'END'
9133
+ Oops!
9134
+
9135
+ Your 'rm' program seems unable to run without file operands specified
9136
+ on the command line, even when the '-f' option is present. This is contrary
9137
+ to the behaviour of most rm programs out there, and not conforming with
9138
+ the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
9139
+
9140
+ Please tell [email protected] about your system, including the value
9141
+ of your $PATH and any error possibly output before this message. This
9142
+ can help us improve future automake versions.
9143
+
9144
+ END
9145
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
9146
+ echo 'Configuration will proceed anyway, since you have set the' >&2
9147
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
9148
+ echo >&2
9149
+ else
9150
+ cat >&2 <<'END'
9151
+ Aborting the configuration process, to ensure you take notice of the issue.
9152
+
9153
+ You can download and install GNU coreutils to get an 'rm' implementation
9154
+ that behaves properly: <http://www.gnu.org/software/coreutils/>.
9155
+
9156
+ If you want to complete the configuration process using your problematic
9157
+ 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
9158
+ to "yes", and re-run configure.
9159
+
9160
+ END
9161
+ AC_MSG_ERROR ( [ Your 'rm' program is bad, sorry.] )
9162
+ fi
9163
+ fi] )
9127
9164
9128
9165
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
9129
9166
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
9130
9167
dnl mangled by Autoconf and run in a shell conditional statement.
9131
9168
m4_define ( [ _AC_COMPILER_EXEEXT] ,
9132
9169
m4_defn ( [ _AC_COMPILER_EXEEXT] ) [ m4_provide([ _AM_COMPILER_EXEEXT] )] )
9133
9170
9134
-
9135
9171
# When config.status generates a header, we must update the stamp-h file.
9136
9172
# This file resides in the same directory as the config header
9137
9173
# that is generated. The stamp files are numbered to have different names.
@@ -9342,6 +9378,70 @@ AC_DEFUN([_AM_SET_OPTIONS],
9342
9378
AC_DEFUN ( [ _AM_IF_OPTION] ,
9343
9379
[ m4_ifset ( _AM_MANGLE_OPTION ( [ $1 ] ) , [ $2 ] , [ $3 ] ) ] )
9344
9380
9381
+ # Copyright (C) 1999-2013 Free Software Foundation, Inc.
9382
+ #
9383
+ # This file is free software; the Free Software Foundation
9384
+ # gives unlimited permission to copy and/or distribute it,
9385
+ # with or without modifications, as long as this notice is preserved.
9386
+
9387
+ # _AM_PROG_CC_C_O
9388
+ # ---------------
9389
+ # Like AC_PROG_CC_C_O , but changed for automake. We rewrite AC_PROG_CC
9390
+ # to automatically call this.
9391
+ AC_DEFUN ( [ _AM_PROG_CC_C_O] ,
9392
+ [ AC_REQUIRE ( [ AM_AUX_DIR_EXPAND] ) dnl
9393
+ AC_REQUIRE_AUX_FILE ( [ compile] ) dnl
9394
+ AC_LANG_PUSH ( [ C] ) dnl
9395
+ AC_CACHE_CHECK (
9396
+ [ whether $CC understands -c and -o together] ,
9397
+ [ am_cv_prog_cc_c_o] ,
9398
+ [ AC_LANG_CONFTEST ( [ AC_LANG_PROGRAM ( [ ] ) ] )
9399
+ # Make sure it works both with $CC and with simple cc.
9400
+ # Following AC_PROG_CC_C_O , we do the test twice because some
9401
+ # compilers refuse to overwrite an existing .o file with -o,
9402
+ # though they will create one.
9403
+ am_cv_prog_cc_c_o=yes
9404
+ for am_i in 1 2; do
9405
+ if AM_RUN_LOG([ $CC -c conftest.$ac_ext -o conftest2.$ac_objext] ) \
9406
+ && test -f conftest2.$ac_objext; then
9407
+ : OK
9408
+ else
9409
+ am_cv_prog_cc_c_o=no
9410
+ break
9411
+ fi
9412
+ done
9413
+ rm -f core conftest*
9414
+ unset am_i] )
9415
+ if test "$am_cv_prog_cc_c_o" != yes; then
9416
+ # Losing compiler, so override with the script.
9417
+ # FIXME: It is wrong to rewrite CC.
9418
+ # But if we don't then we get into trouble of one sort or another.
9419
+ # A longer-term fix would be to have automake use am__CC in this case,
9420
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
9421
+ CC="$am_aux_dir/compile $CC"
9422
+ fi
9423
+ AC_LANG_POP ( [ C] ) ] )
9424
+
9425
+ # For backward compatibility.
9426
+ AC_DEFUN_ONCE ( [ AM_PROG_CC_C_O ] , [ AC_REQUIRE ( [ AC_PROG_CC ] ) ] )
9427
+
9428
+ # Copyright (C) 2001-2013 Free Software Foundation, Inc.
9429
+ #
9430
+ # This file is free software; the Free Software Foundation
9431
+ # gives unlimited permission to copy and/or distribute it,
9432
+ # with or without modifications, as long as this notice is preserved.
9433
+
9434
+ # AM_RUN_LOG(COMMAND)
9435
+ # -------------------
9436
+ # Run COMMAND, save the exit status in ac_status, and log it.
9437
+ # (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
9438
+ AC_DEFUN ( [ AM_RUN_LOG] ,
9439
+ [ { echo "$as_me:$LINENO: $1 " >&AS_MESSAGE_LOG_FD
9440
+ ($1 ) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
9441
+ ac_status=$?
9442
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
9443
+ (exit $ac_status); }] )
9444
+
9345
9445
# Check to make sure that the build environment is sane. -*- Autoconf -*-
9346
9446
9347
9447
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
0 commit comments