From 5f7ea15eb4f151ca73d22e61678ff53e37959f21 Mon Sep 17 00:00:00 2001 From: jakub Date: Thu, 19 Jan 2017 12:23:00 +0000 Subject: PR other/79046 * aclocal.m4: Include ../config/acx.m4. * configure: Regenerated. * Makefile.in: Regenerated. * mpxrt/Makefile.in: Regenerated. * mpxwrap/Makefile.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244627 138bc75d-0d04-0410-961f-82ee72b054a4 --- libmpx/ChangeLog | 9 +++++++++ libmpx/Makefile.in | 4 +++- libmpx/aclocal.m4 | 1 + libmpx/configure | 22 +++++++++++++++++++--- libmpx/mpxrt/Makefile.in | 4 +++- libmpx/mpxwrap/Makefile.in | 4 +++- 6 files changed, 38 insertions(+), 6 deletions(-) (limited to 'libmpx') diff --git a/libmpx/ChangeLog b/libmpx/ChangeLog index 3bf0376aea69..4e344597d81c 100644 --- a/libmpx/ChangeLog +++ b/libmpx/ChangeLog @@ -1,3 +1,12 @@ +2017-01-19 Jakub Jelinek + + PR other/79046 + * aclocal.m4: Include ../config/acx.m4. + * configure: Regenerated. + * Makefile.in: Regenerated. + * mpxrt/Makefile.in: Regenerated. + * mpxwrap/Makefile.in: Regenerated. + 2017-01-17 Jakub Jelinek PR other/79046 diff --git a/libmpx/Makefile.in b/libmpx/Makefile.in index 9b1d7a6c31f4..5e58b7299bfb 100644 --- a/libmpx/Makefile.in +++ b/libmpx/Makefile.in @@ -59,7 +59,8 @@ DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \ $(srcdir)/libmpx.spec.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ @@ -216,6 +217,7 @@ dvidir = @dvidir@ enable_shared = @enable_shared@ enable_static = @enable_static@ exec_prefix = @exec_prefix@ +get_gcc_base_ver = @get_gcc_base_ver@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/libmpx/aclocal.m4 b/libmpx/aclocal.m4 index 9e505c1cd3fb..886b71f9a17f 100644 --- a/libmpx/aclocal.m4 +++ b/libmpx/aclocal.m4 @@ -705,6 +705,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([../config/acx.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/multi.m4]) m4_include([../config/override.m4]) diff --git a/libmpx/configure b/libmpx/configure index 115f53e475cb..853993a522f1 100644 --- a/libmpx/configure +++ b/libmpx/configure @@ -603,6 +603,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +get_gcc_base_ver XCFLAGS enable_static enable_shared @@ -731,6 +732,7 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock +with_gcc_major_version_only ' ac_precious_vars='build_alias host_alias @@ -1377,6 +1379,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-gcc-major-version-only + use only GCC major number in filesystem paths Some influential environment variables: CC C compiler command @@ -11230,7 +11234,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11233 "configure" +#line 11237 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11336,7 +11340,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11339 "configure" +#line 11343 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11586,7 +11590,19 @@ else fi # Determine what GCC version number to use in filesystem paths. -GCC_BASE_VER + + get_gcc_base_ver="cat" + +# Check whether --with-gcc-major-version-only was given. +if test "${with_gcc_major_version_only+set}" = set; then : + withval=$with_gcc_major_version_only; if test x$with_gcc_major_version_only = xyes ; then + get_gcc_base_ver="sed -e 's/^\([0-9]*\).*\$\$/\1/'" + fi + +fi + + + ac_config_files="$ac_config_files Makefile libmpx.spec" diff --git a/libmpx/mpxrt/Makefile.in b/libmpx/mpxrt/Makefile.in index 1fdb454f4589..1770350e9233 100644 --- a/libmpx/mpxrt/Makefile.in +++ b/libmpx/mpxrt/Makefile.in @@ -55,7 +55,8 @@ target_triplet = @target@ subdir = mpxrt DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ @@ -210,6 +211,7 @@ dvidir = @dvidir@ enable_shared = @enable_shared@ enable_static = @enable_static@ exec_prefix = @exec_prefix@ +get_gcc_base_ver = @get_gcc_base_ver@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/libmpx/mpxwrap/Makefile.in b/libmpx/mpxwrap/Makefile.in index df1a3347ba0e..19209b3a49b3 100644 --- a/libmpx/mpxwrap/Makefile.in +++ b/libmpx/mpxwrap/Makefile.in @@ -55,7 +55,8 @@ target_triplet = @target@ subdir = mpxwrap DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ @@ -209,6 +210,7 @@ dvidir = @dvidir@ enable_shared = @enable_shared@ enable_static = @enable_static@ exec_prefix = @exec_prefix@ +get_gcc_base_ver = @get_gcc_base_ver@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ -- cgit v1.2.3