diff options
Diffstat (limited to 'fastjar')
| -rw-r--r-- | fastjar/ChangeLog | 5 | ||||
| -rw-r--r-- | fastjar/Makefile.in | 3 | ||||
| -rw-r--r-- | fastjar/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | fastjar/configure | 19 | ||||
| -rw-r--r-- | fastjar/configure.ac | 12 |
5 files changed, 24 insertions, 16 deletions
diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index c789fbd6b50..a429a6369cb 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,8 @@ +2004-12-02 Richard Sandiford <rsandifo@redhat.com> + + * configure.ac: Use TL_AC_GCC_VERSION to set gcc_version. + * configure, aclocal.m4, Makefile.in: Regenerate. + 2004-11-15 Kelley Cook <kcook@gcc.gnu.org> * Makefile.am: Remove -no-dependencies. diff --git a/fastjar/Makefile.in b/fastjar/Makefile.in index 493fac88c81..309e5ea70e9 100644 --- a/fastjar/Makefile.in +++ b/fastjar/Makefile.in @@ -49,6 +49,7 @@ DIST_COMMON = README $(am__configure_deps) $(fastjar_TEXINFOS) \ COPYING ChangeLog INSTALL NEWS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \ + $(top_srcdir)/../config/gcc-version.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -175,6 +176,8 @@ datadir = @datadir@ exec_prefix = @exec_prefix@ fastjar_warn_cflags = @fastjar_warn_cflags@ gcc_version = @gcc_version@ +gcc_version_full = @gcc_version_full@ +gcc_version_trigger = @gcc_version_trigger@ host_alias = @host_alias@ includedir = @includedir@ infodir = @infodir@ diff --git a/fastjar/aclocal.m4 b/fastjar/aclocal.m4 index f8ccf0d9654..5710bf10775 100644 --- a/fastjar/aclocal.m4 +++ b/fastjar/aclocal.m4 @@ -1083,4 +1083,5 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([../config/accross.m4]) +m4_include([../config/gcc-version.m4]) m4_include([acinclude.m4]) diff --git a/fastjar/configure b/fastjar/configure index 948ac719da3..765bee8caca 100755 --- a/fastjar/configure +++ b/fastjar/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 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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RM CP CHMOD MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT fastjar_warn_cflags CPP EGREP ZLIBS ZDEPS ZINCS GENINSRC_TRUE GENINSRC_FALSE gcc_version 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 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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RM CP CHMOD MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT fastjar_warn_cflags CPP EGREP ZLIBS ZDEPS ZINCS GENINSRC_TRUE GENINSRC_FALSE gcc_version_trigger gcc_version_full gcc_version LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -5226,16 +5226,23 @@ else fi -# Get the version trigger filename from the toplevel + if test "${with_gcc_version_trigger+set}" = set; then - gcc_version_trigger=$with_gcc_version_trigger + 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_trigger=${srcdir}/version.c + gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'` fi -gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*"\([^"]*\)".*/\1/'` gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` + + + ac_config_files="$ac_config_files Makefile install-defs.sh" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -5941,6 +5948,8 @@ s,@ZDEPS@,$ZDEPS,;t t s,@ZINCS@,$ZINCS,;t t s,@GENINSRC_TRUE@,$GENINSRC_TRUE,;t t s,@GENINSRC_FALSE@,$GENINSRC_FALSE,;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,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t diff --git a/fastjar/configure.ac b/fastjar/configure.ac index fa3ecf4ac0e..935c49dfeb6 100644 --- a/fastjar/configure.ac +++ b/fastjar/configure.ac @@ -89,16 +89,6 @@ AC_MSG_CHECKING([whether to place generated files in the source directory]) AC_MSG_RESULT($generated_files_in_srcdir) AM_CONDITIONAL(GENINSRC, test x$generated_files_in_srcdir = xyes) -# Get the version trigger filename from the toplevel -if test "${with_gcc_version_trigger+set}" = set; then - gcc_version_trigger=$with_gcc_version_trigger -else - gcc_version_trigger=${srcdir}/version.c -fi -changequote(,)dnl -gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*"\([^"]*\)".*/\1/'` -gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` -changequote([,])dnl -AC_SUBST(gcc_version) +TL_AC_GCC_VERSION([$srcdir/..]) AC_OUTPUT(Makefile install-defs.sh) |