diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-14 12:21:28 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-14 12:21:28 +0000 |
| commit | 088d15854b4bfcbf10fe060332c0c769817c714c (patch) | |
| tree | 06af9f71b20644367a553872280b9ad19b06ae9a | |
| parent | 74ab9d292c03a55b8502524b29cd78ae213471cd (diff) | |
| download | gcc-088d15854b4bfcbf10fe060332c0c769817c714c.tar.gz | |
Don't set AC_CONFIG_AUX_DIR
* configure.ac (AC_CONFIG_AUX_DIR): Removed.
* Makefile.in: Regenerated.
* configure: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193499 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libsanitizer/ChangeLog | 6 | ||||
| -rw-r--r-- | libsanitizer/Makefile.in | 6 | ||||
| -rwxr-xr-x | libsanitizer/configure | 8 | ||||
| -rw-r--r-- | libsanitizer/configure.ac | 1 |
4 files changed, 11 insertions, 10 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 6074d5bc4df..c67c7f11db2 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,9 @@ +2012-11-14 H.J. Lu <hongjiu.lu@intel.com> + + * configure.ac (AC_CONFIG_AUX_DIR): Removed. + * Makefile.in: Regenerated. + * configure: Likewise. + 2012-11-13 H.J. Lu <hongjiu.lu@intel.com> PR other/55304 diff --git a/libsanitizer/Makefile.in b/libsanitizer/Makefile.in index 8049a7e8074..babe91f59c6 100644 --- a/libsanitizer/Makefile.in +++ b/libsanitizer/Makefile.in @@ -38,11 +38,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/../config.guess \ $(srcdir)/../config.sub $(srcdir)/../install-sh \ $(srcdir)/../ltmain.sh $(srcdir)/../missing \ $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure ../ABOUT-NLS \ - ../COPYING ../COPYING.LIB ../ChangeLog ../README ../compile \ - ../config.guess ../config.rpath ../config.sub ../depcomp \ - ../install-sh ../ltmain.sh ../missing ../mkinstalldirs \ - ../ylwrap + $(srcdir)/Makefile.in $(top_srcdir)/configure ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ diff --git a/libsanitizer/configure b/libsanitizer/configure index ba6fe678c43..d69f5a75cea 100755 --- a/libsanitizer/configure +++ b/libsanitizer/configure @@ -2215,8 +2215,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +am__api_version='1.11' + ac_aux_dir= -for ac_dir in .. "$srcdir"/..; do +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 @@ -2226,7 +2228,7 @@ for ac_dir in .. "$srcdir"/..; do done done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in .. \"$srcdir\"/.." "$LINENO" 5 + 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, @@ -2238,8 +2240,6 @@ 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. -am__api_version='1.11' - # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: diff --git a/libsanitizer/configure.ac b/libsanitizer/configure.ac index cd57a699089..0b6cdef9425 100644 --- a/libsanitizer/configure.ac +++ b/libsanitizer/configure.ac @@ -4,7 +4,6 @@ AC_PREREQ([2.64]) AC_INIT(package-unused, version-unused, libsanitizer) AC_CONFIG_SRCDIR([include/sanitizer/common_interface_defs.h]) -AC_CONFIG_AUX_DIR(..) AM_INIT_AUTOMAKE(foreign) # Checks for programs. |