diff options
| author | DJ Delorie <dj@redhat.com> | 2013-07-09 16:04:44 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2013-07-09 16:04:44 +0000 |
| commit | 564027b8a9792a79467d4d9d972ee0c46d82fd11 (patch) | |
| tree | 05ae70d2353206a03817750649aad83c003a9140 | |
| parent | 466c1fcab760e27b5a335e2fc99001809d03a05f (diff) | |
| download | gdb-564027b8a9792a79467d4d9d972ee0c46d82fd11.zip gdb-564027b8a9792a79467d4d9d972ee0c46d82fd11.tar.gz gdb-564027b8a9792a79467d4d9d972ee0c46d82fd11.tar.bz2 | |
merge from gcc
| -rw-r--r-- | libdecnumber/ChangeLog | 5 | ||||
| -rwxr-xr-x | libdecnumber/configure | 46 | ||||
| -rw-r--r-- | libdecnumber/configure.ac | 1 |
3 files changed, 29 insertions, 23 deletions
diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog index eba0698..fb88bcc 100644 --- a/libdecnumber/ChangeLog +++ b/libdecnumber/ChangeLog @@ -1,3 +1,8 @@ +2013-07-09 Simon Baldwin <simonb@google.com> + + * configure.ac: Add AC_CONFIG_AUX_DIR. + * configure: Regenerated. + 2013-03-27 Kai Tietz <ktietz@redhat.com> * configure: Regenerated. diff --git a/libdecnumber/configure b/libdecnumber/configure index 91721de..4a1896e 100755 --- a/libdecnumber/configure +++ b/libdecnumber/configure @@ -2220,6 +2220,29 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_aux_dir= +for ac_dir in .. "$srcdir"/..; do + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done +done +if test -z "$ac_aux_dir"; then + as_fn_error "cannot find install-sh, install.sh, or shtool in .. \"$srcdir\"/.." "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + # Checks for programs. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 @@ -4458,29 +4481,6 @@ else fi -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done -done -if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 diff --git a/libdecnumber/configure.ac b/libdecnumber/configure.ac index a6f7f07..6cfc803 100644 --- a/libdecnumber/configure.ac +++ b/libdecnumber/configure.ac @@ -23,6 +23,7 @@ AC_PREREQ(2.64) AC_INIT(libdecnumber, [ ], gcc-bugs@gcc.gnu.org, libdecnumber) AC_CONFIG_SRCDIR(decNumber.h) AC_CONFIG_MACRO_DIR(../config) +AC_CONFIG_AUX_DIR(..) # Checks for programs. AC_PROG_MAKE_SET |