diff options
author | Richard Sandiford <rsandifo@redhat.com> | 2004-12-02 11:05:13 +0000 |
---|---|---|
committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2004-12-02 11:05:13 +0000 |
commit | afabd8e62cdcf6935dbe819278aa0b62c0a8c291 (patch) | |
tree | 474f34608ab902f9ddc5b7629c88676c03a26731 /libmudflap | |
parent | 5191f2ba91f987277423dec3c58ac37bd76a814b (diff) | |
download | gcc-afabd8e62cdcf6935dbe819278aa0b62c0a8c291.zip gcc-afabd8e62cdcf6935dbe819278aa0b62c0a8c291.tar.gz gcc-afabd8e62cdcf6935dbe819278aa0b62c0a8c291.tar.bz2 |
Introduce and use config/gcc-version.m4.
From-SVN: r91625
Diffstat (limited to 'libmudflap')
-rw-r--r-- | libmudflap/ChangeLog | 6 | ||||
-rw-r--r-- | libmudflap/Makefile.in | 5 | ||||
-rw-r--r-- | libmudflap/aclocal.m4 | 1 | ||||
-rwxr-xr-x | libmudflap/configure | 23 | ||||
-rw-r--r-- | libmudflap/configure.ac | 6 | ||||
-rw-r--r-- | libmudflap/testsuite/Makefile.in | 3 |
6 files changed, 33 insertions, 11 deletions
diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog index 8b74d4b..d3639a0 100644 --- a/libmudflap/ChangeLog +++ b/libmudflap/ChangeLog @@ -1,3 +1,9 @@ +2004-12-02 Richard Sandiford <rsandifo@redhat.com> + + * configure.ac: Use TL_AC_GCC_VERSION to set gcc_version. + * aclocal.m4: Include ../config/gcc-version.m4. + * configure, Makefile.in, testsuite/Makefile.in: Regenerate. + 2004-11-29 Kelley Cook <kcook@gcc.gnu.org> * Makefile.am: Define ACLOCAL_AMFLAGS. diff --git a/libmudflap/Makefile.in b/libmudflap/Makefile.in index 9098265..f961db3 100644 --- a/libmudflap/Makefile.in +++ b/libmudflap/Makefile.in @@ -50,6 +50,7 @@ DIST_COMMON = $(am__configure_deps) $(include_HEADERS) \ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/../config/gcc-version.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -191,6 +192,8 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ exec_prefix = @exec_prefix@ gcc_version = @gcc_version@ +gcc_version_full = @gcc_version_full@ +gcc_version_trigger = @gcc_version_trigger@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -578,7 +581,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/testsuite + $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../config $(distdir)/testsuite @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/libmudflap/aclocal.m4 b/libmudflap/aclocal.m4 index 99613bf..dc5fcd6 100644 --- a/libmudflap/aclocal.m4 +++ b/libmudflap/aclocal.m4 @@ -1128,3 +1128,4 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([../libtool.m4]) +m4_include([../config/gcc-version.m4]) diff --git a/libmudflap/configure b/libmudflap/configure index 49040fa..d96a46a 100755 --- a/libmudflap/configure +++ b/libmudflap/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS CPP CPPFLAGS EGREP LN_S RANLIB ac_ct_RANLIB LIBTOOL enable_shared enable_static MF_HAVE_STDINT_H MF_HAVE_UINTPTR_T LIBMUDFLAPTH_TRUE LIBMUDFLAPTH_FALSE build_libmudflapth gcc_version toolexecdir toolexeclibdir NM ac_ct_NM SECTION_FLAGS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS CPP CPPFLAGS EGREP LN_S RANLIB ac_ct_RANLIB LIBTOOL enable_shared enable_static MF_HAVE_STDINT_H MF_HAVE_UINTPTR_T LIBMUDFLAPTH_TRUE LIBMUDFLAPTH_FALSE build_libmudflapth gcc_version_trigger gcc_version_full gcc_version toolexecdir toolexeclibdir NM ac_ct_NM SECTION_FLAGS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -6509,10 +6509,21 @@ _ACEOF fi -# Process the option "--enable-version-specific-runtime-libs" -gcc_version_trigger=${srcdir}/../gcc/version.c -gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'` -gcc_version=`echo ${gcc_version_full} | sed -e 's/\(^ *\) .*/\1/'` + +if test "${with_gcc_version_trigger+set}" = set; then + gcc_version_trigger=$with_gcc_version_trigger +else + gcc_version_trigger=$srcdir/../gcc/version.c +fi +if test -f "${gcc_version_trigger}"; then + gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'` +else + gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'` +fi +gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` + + + # Calculate toolexeclibdir @@ -7577,6 +7588,8 @@ s,@MF_HAVE_UINTPTR_T@,$MF_HAVE_UINTPTR_T,;t t s,@LIBMUDFLAPTH_TRUE@,$LIBMUDFLAPTH_TRUE,;t t s,@LIBMUDFLAPTH_FALSE@,$LIBMUDFLAPTH_FALSE,;t t s,@build_libmudflapth@,$build_libmudflapth,;t t +s,@gcc_version_trigger@,$gcc_version_trigger,;t t +s,@gcc_version_full@,$gcc_version_full,;t t s,@gcc_version@,$gcc_version,;t t s,@toolexecdir@,$toolexecdir,;t t s,@toolexeclibdir@,$toolexeclibdir,;t t diff --git a/libmudflap/configure.ac b/libmudflap/configure.ac index 05f46f1..794fa9b 100644 --- a/libmudflap/configure.ac +++ b/libmudflap/configure.ac @@ -132,11 +132,7 @@ AC_SUBST(build_libmudflapth) AC_CHECK_LIB(dl, dlsym) -# Process the option "--enable-version-specific-runtime-libs" -gcc_version_trigger=${srcdir}/../gcc/version.c -gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/'` -gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` -AC_SUBST(gcc_version) +TL_AC_GCC_VERSION([$srcdir/..]) # Calculate toolexeclibdir # Also toolexecdir, though it's only used in toolexeclibdir diff --git a/libmudflap/testsuite/Makefile.in b/libmudflap/testsuite/Makefile.in index f810ec8..8e7a8e6 100644 --- a/libmudflap/testsuite/Makefile.in +++ b/libmudflap/testsuite/Makefile.in @@ -41,6 +41,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/mfconfig.exp.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/../config/gcc-version.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -128,6 +129,8 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ exec_prefix = @exec_prefix@ gcc_version = @gcc_version@ +gcc_version_full = @gcc_version_full@ +gcc_version_trigger = @gcc_version_trigger@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ |