This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Update autoconf in binutils and ld directories and import ylwrap


This patch updates binutils and ld to current versions of autoconf and
automake, updates the top level ylwrap, and adjusts gas and gdb to call
ylwrap using the new syntax.

The GCC repository only gets the updated ylwrap; nothing else in src or gcc
uses it.

Tested by building:
  - Native i686-pc-linux-gnu binutils
  - Cross i686-linux -> arm-linux binutils and gdb.
  - Host-x-host native arm-linux binutils from an i686-linux host.
  - Host-x-host cross arm-linux to arm-linux-gnu binutils from an i686-linux
    host.
  - Binutils release tarballs.
  - Native binutils from the release tarball, using a readonly source
    directory - required the same fiddling that I gave gas and bfd earlier.
  - And a complete cross toolchain including gcc and glibc, just for kicks.

Whew.

Maciej, I did make use of the binutils and ld patches you posted a couple
weeks ago, but they're barely recognizable at this point.

Eli, I double-checked as best as I was able that the new ylwrap handles
DOS-specific paths OK.  There were some local commits in the src repository
for this, but upstream appears to be OK now.

I don't need any approval for this patch, but I would definitely appreciate
proofreading before I check it in.  I have left out the (huge) changes to
generated files.

Comments?

After this patch, binutils releases will be fully up to current autotools,
except for libtool and the top level.  The src repository, however, is still
a mess: I count about a dozen still using autoconf 2.13, including
newlib/libgloss, sid, and imported packages like tcl, expect, and dejagnu. 
If we want all the subdirectories converted before the top level, someone
needs to pitch in and help.

-- 
Daniel Jacobowitz
CodeSourcery, LLC

./
2005-05-12  Daniel Jacobowitz  <dan@codesourcery.com>

	* ylwrap: Import from Automake 1.9.5.

binutils/
2005-05-12  Daniel Jacobowitz  <dan@codesourcery.com>

	* acinclude.m4: Remove obsolete code.
	* configure.in: Update AC_PREREQ.
	* doc/Makefile.am (binutils_TEXINFOS): Define.
	(config.texi): Depend on distributed files instead of built
	files.
	(binutils.dvi, binutils.info): Remove unnecessary rules.
	(DISTCLEANFILES): Remove.
	(install-data-local): Renamed from install.
	(info-local): Renamed from info.
	* Makefile.in, aclocal.m4, config.in, configure,
	doc/Makefile.in: Regenerated.

gas/
2005-05-12  Daniel Jacobowitz  <dan@codesourcery.com>

	* Makefile.am (m68k-parse.c, itbl-parse.c): Update ylwrap
	invocation.
	* Makefile.in: Regenerated.

ld/
2005-05-12  Daniel Jacobowitz  <dan@codesourcery.com>

	* Makefile.am (AM_MAKEINFOFLAGS): Define.
	(TEXI2DVI): Define.
	(ldver.texi): Depend on distributed files instead of built files.
	(ld.info): Include $(srcdir) in the rule target.  Remove actions.
	(ld.dvi): Remove actions.
	(MAINTAINERCLEANFILES): Add configdoc.texi.
	(CONFIG_STATUS_DEPENDENCIES): Add bfd/configure.in.
	(install-data-local): Renamed from install.
	(Makefile): Remove explicit dependency.
	* acinclude.m4: Remove obsolete code.
	* configure.in: Update AC_PREREQ.  Remove extra $CONFIG_SHELL.
	* Makefile.in, aclocal.m4, config.in, configure: Regenerated.

gdb/
2005-05-12  Daniel Jacobowitz  <dan@codesourcery.com>

	* Makefile.in (.y.c): Update ylwrap invocation.

Index: ylwrap
===================================================================
RCS file: /home/drow/rsync/src/src/ylwrap,v
retrieving revision 1.3
diff -u -p -r1.3 ylwrap
--- ylwrap	24 Sep 2004 13:21:46 -0000	1.3
+++ ylwrap	12 May 2005 14:07:04 -0000
@@ -1,6 +1,11 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+
+scriptversion=2005-02-02.22
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
+#   Free Software Foundation, Inc.
+#
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,56 +22,81 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-# Usage:
-#     ylwrap PROGRAM INPUT [OUTPUT DESIRED]... -- [ARGS]...
-# * PROGRAM is program to run.
-# * INPUT is the input file
-# * OUTPUT is file PROG generates
-# * DESIRED is file we actually want
-# * ARGS are passed to PROG
-# Any number of OUTPUT,DESIRED pairs may be used.
-
-# The program to run.
-prog="$1"
-shift
-# Make any relative path in $prog absolute.
-case "$prog" in
- /* | [A-Za-z]:\\*) ;;
- */*) prog="`pwd`/$prog" ;;
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case "$1" in
+  '')
+    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
+    exit 1
+    ;;
+  --basedir)
+    basedir=$2
+    shift 2
+    ;;
+  -h|--h*)
+    cat <<\EOF
+Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
+
+Wrapper for lex/yacc invocations, renaming files as desired.
+
+  INPUT is the input file
+  OUTPUT is one file PROG generates
+  DESIRED is the file we actually want instead of OUTPUT
+  PROGRAM is program to run
+  ARGS are passed to PROG
+
+Any number of OUTPUT,DESIRED pairs may be used.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v|--v*)
+    echo "ylwrap $scriptversion"
+    exit $?
+    ;;
 esac
 
+
 # The input.
 input="$1"
 shift
 case "$input" in
- /* | [A-Za-z]:\\*)
+  [\\/]* | ?:[\\/]*)
     # Absolute path; do nothing.
     ;;
- *)
-    # Relative path.  Make it absolute.  Why?  Because otherwise any
-    # debugging info in the generated file will point to the wrong
-    # place.  This is really gross.
+  *)
+    # Relative path.  Make it absolute.
     input="`pwd`/$input"
     ;;
 esac
 
-# We don't want to use the absolute path if the input in the current
-# directory like when making a tar ball.
-input_base=`echo $input | sed -e 's|.*/||'`
-if test -f $input_base && cmp $input_base $input >/dev/null 2>&1; then
-  input=$input_base
-fi
-
 pairlist=
 while test "$#" -ne 0; do
-   if test "$1" = "--"; then
-      shift
-      break
-   fi
-   pairlist="$pairlist $1"
-   shift
+  if test "$1" = "--"; then
+    shift
+    break
+  fi
+  pairlist="$pairlist $1"
+  shift
 done
 
+# The program to run.
+prog="$1"
+shift
+# Make any relative path in $prog absolute.
+case "$prog" in
+  [\\/]* | ?:[\\/]*) ;;
+  *[\\/]*) prog="`pwd`/$prog" ;;
+esac
+
 # FIXME: add hostname here for parallel makes that run commands on
 # other machines.  But that might take us over the 14-char limit.
 dirname=ylwrap$$
@@ -74,50 +104,119 @@ trap "cd `pwd`; rm -rf $dirname > /dev/n
 mkdir $dirname || exit 1
 
 cd $dirname
-case "$input" in
- /* | [A-Za-z]:\\*)
-    # Absolute path; do nothing.
-    ;;
- *)
-    # Make a symbolic link, hard link or hardcopy.
-    ln -s ../"$input" . > /dev/null 2>&1 || ln ../"$input" . > /dev/null 2>&1 || cp ../"$input" .
-    ;;
+
+case $# in
+  0) $prog "$input" ;;
+  *) $prog "$@" "$input" ;;
 esac
-$prog ${1+"$@"} "$input"
-status=$?
+ret=$?
 
-if test $status -eq 0; then
-   set X $pairlist
-   shift
-   first=yes
-   while test "$#" -ne 0; do
-      if test -f "$1"; then
-         # If $2 is an absolute path name, then just use that,
-         # otherwise prepend `../'.
-         case "$2" in
-	   /* | [A-Za-z]:\\*) target="$2";;
-	   *) target="../$2";;
-	 esac
-	 mv "$1" "$target" || status=$?
+if test $ret -eq 0; then
+  set X $pairlist
+  shift
+  first=yes
+  # Since DOS filename conventions don't allow two dots,
+  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
+  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
+  y_tab_nodot="no"
+  if test -f y_tab.c || test -f y_tab.h; then
+    y_tab_nodot="yes"
+  fi
+
+  # The directory holding the input.
+  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
+  # Quote $INPUT_DIR so we can use it in a regexp.
+  # FIXME: really we should care about more than `.' and `\'.
+  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
+
+  while test "$#" -ne 0; do
+    from="$1"
+    # Handle y_tab.c and y_tab.h output by DOS
+    if test $y_tab_nodot = "yes"; then
+      if test $from = "y.tab.c"; then
+    	from="y_tab.c"
       else
-	 # A missing file is only an error for the first file.  This
-	 # is a blatant hack to let us support using "yacc -d".  If -d
-	 # is not specified, we don't want an error when the header
-	 # file is "missing".
-	 if test $first = yes; then
-	    status=1
-	 fi
+    	if test $from = "y.tab.h"; then
+    	  from="y_tab.h"
+    	fi
       fi
-      shift
-      shift
-      first=no
-   done
+    fi
+    if test -f "$from"; then
+      # If $2 is an absolute path name, then just use that,
+      # otherwise prepend `../'.
+      case "$2" in
+    	[\\/]* | ?:[\\/]*) target="$2";;
+    	*) target="../$2";;
+      esac
+
+      # We do not want to overwrite a header file if it hasn't
+      # changed.  This avoid useless recompilations.  However the
+      # parser itself (the first file) should always be updated,
+      # because it is the destination of the .y.c rule in the
+      # Makefile.  Divert the output of all other files to a temporary
+      # file so we can compare them to existing versions.
+      if test $first = no; then
+	realtarget="$target"
+	target="tmp-`echo $target | sed s/.*[\\/]//g`"
+      fi
+      # Edit out `#line' or `#' directives.
+      #
+      # We don't want the resulting debug information to point at
+      # an absolute srcdir; it is better for it to just mention the
+      # .y file with no path.
+      #
+      # We want to use the real output file name, not yy.lex.c for
+      # instance.
+      #
+      # We want the include guards to be adjusted too.
+      FROM=`echo "$from" | sed \
+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+      TARGET=`echo "$2" | sed \
+            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+
+      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
+          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
+
+      # Check whether header files must be updated.
+      if test $first = no; then
+	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+	  echo "$2" is unchanged
+	  rm -f "$target"
+	else
+          echo updating "$2"
+          mv -f "$target" "$realtarget"
+        fi
+      fi
+    else
+      # A missing file is only an error for the first file.  This
+      # is a blatant hack to let us support using "yacc -d".  If -d
+      # is not specified, we don't want an error when the header
+      # file is "missing".
+      if test $first = yes; then
+        ret=1
+      fi
+    fi
+    shift
+    shift
+    first=no
+  done
 else
-   status=$?
+  ret=$?
 fi
 
 # Remove the directory.
 cd ..
 rm -rf $dirname
 
-exit $status
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
Index: binutils/acinclude.m4
===================================================================
RCS file: /home/drow/rsync/src/src/binutils/acinclude.m4,v
retrieving revision 1.4
diff -u -p -r1.4 acinclude.m4
--- binutils/acinclude.m4	14 Jan 2004 13:41:37 -0000	1.4
+++ binutils/acinclude.m4	12 May 2005 14:20:03 -0000
@@ -1,32 +1 @@
 sinclude(../bfd/acinclude.m4)
-
-dnl sinclude(../libtool.m4) already included in bfd/acinclude.m4
-dnl The lines below arrange for aclocal not to bring libtool.m4
-dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
-dnl to add a definition of LIBTOOL to Makefile.in.
-ifelse(yes,no,[
-AC_DEFUN([AM_PROG_LIBTOOL],)
-AC_SUBST(LIBTOOL)
-])
-
-dnl sinclude(../gettext.m4) already included in bfd/acinclude.m4
-ifelse(yes,no,[
-AC_DEFUN([CY_WITH_NLS],)
-AC_SUBST(INTLLIBS)
-])
-
-## Replacement for AC_PROG_LEX and AC_DECL_YYTEXT
-## by Alexandre Oliva <oliva@dcc.unicamp.br>
-
-## We need to override the installed aclocal/lex.m4 because of a bug in
-## this definition in the recommended automake snapshot of 000227:
-## There were double-quotes around ``$missing_dir/missing flex'' which was
-## bad since aclocal wraps it in double-quotes.
-
-dnl AM_PROG_LEX
-dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
-AC_DEFUN([AM_PROG_LEX],
-[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
-AC_CHECK_PROGS(LEX, flex lex, [$missing_dir/missing flex])
-AC_PROG_LEX
-AC_DECL_YYTEXT])
Index: binutils/configure.in
===================================================================
RCS file: /home/drow/rsync/src/src/binutils/configure.in,v
retrieving revision 1.51
diff -u -p -r1.51 configure.in
--- binutils/configure.in	14 Apr 2005 05:26:27 -0000	1.51
+++ binutils/configure.in	12 May 2005 14:25:35 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-AC_PREREQ(2.13)
+AC_PREREQ(2.57)
 AC_INIT(ar.c)
 
 AC_CANONICAL_SYSTEM
Index: binutils/doc/Makefile.am
===================================================================
RCS file: /home/drow/rsync/src/src/binutils/doc/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- binutils/doc/Makefile.am	8 Dec 2004 02:50:40 -0000	1.7
+++ binutils/doc/Makefile.am	12 May 2005 17:03:24 -0000
@@ -31,18 +31,14 @@ man_MANS = \
 	$(DEMANGLER_NAME).1
 
 info_TEXINFOS = binutils.texi
+binutils_TEXINFOS = config.texi
+binutils_TEXI = $(srcdir)/binutils.texi
 
-config.texi: Makefile
+config.texi: $(srcdir)/../../bfd/configure $(binutils_TEXI)
 	rm -f config.texi
-	echo '@set VERSION $(VERSION)' > config.texi
+	eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@
 	echo "@set UPDATED `date "+%B %Y"`" >> config.texi
 
-binutils_TEXI = $(srcdir)/binutils.texi
-
-binutils.dvi:  $(binutils_TEXI) config.texi
-
-binutils.info: $(binutils_TEXI) config.texi
-
 # Man page generation from texinfo
 addr2line.1:	$(binutils_TEXI)
 	touch $@
@@ -143,7 +139,6 @@ cxxfilt.man:	$(binutils_TEXI)
 	rm -f $(DEMANGLER_NAME).pod
 
 MAINTAINERCLEANFILES = config.texi
-DISTCLEANFILES       = config.texi
 MOSTLYCLEANFILES     = $(DEMANGLER_NAME).1
 
 $(DEMANGLER_NAME).1: cxxfilt.man Makefile
@@ -158,9 +153,9 @@ $(DEMANGLER_NAME).1: cxxfilt.man Makefil
 
 # We want install to imply install-info as per GNU standards, despite the
 # cygnus option.
-install: install-info
+install-data-local: install-info
 
 # Maintenance
 
 # We need it for the taz target in ../../Makefile.in.
-info: $(MANS)
+info-local: $(MANS)
Index: gas/Makefile.am
===================================================================
RCS file: /home/drow/rsync/src/src/gas/Makefile.am,v
retrieving revision 1.109
diff -u -p -r1.109 Makefile.am
--- gas/Makefile.am	29 Apr 2005 00:22:25 -0000	1.109
+++ gas/Makefile.am	12 May 2005 14:30:41 -0000
@@ -635,7 +635,7 @@ m68k-parse.c: $(srcdir)/config/m68k-pars
 	   cp config/m68k-parse.y . >/dev/null 2>/dev/null; \
 	  f=m68k-parse.y; \
 	else true; fi; \
-	$(SHELL) $(YLWRAP) "$(YACC)" $$f y.tab.c m68k-parse.c --; \
+	$(SHELL) $(YLWRAP) $$f y.tab.c m68k-parse.c -- $(YACCCOMPILE); \
 	if [ $$f = "m68k-parse.y" ]; then \
 	  rm -f m68k-parse.y; \
 	else true; fi
@@ -661,7 +661,7 @@ itbl-parse.o: itbl-parse.c itbl-parse.h 
 itbl-ops.o: $(srcdir)/itbl-ops.c $(srcdir)/itbl-ops.h itbl-parse.h
 
 itbl-parse.c itbl-parse.h: $(srcdir)/itbl-parse.y
-	$(SHELL) $(YLWRAP) "$(YACC)" $(srcdir)/itbl-parse.y y.tab.c itbl-parse.c y.tab.h itbl-parse.h -- -d
+	$(SHELL) $(YLWRAP) $(srcdir)/itbl-parse.y y.tab.c itbl-parse.c y.tab.h itbl-parse.h -- $(YACCCOMPILE) -d
 
 # stand-alone itbl assembler & disassembler
 
Index: ld/Makefile.am
===================================================================
RCS file: /home/drow/rsync/src/src/ld/Makefile.am,v
retrieving revision 1.173
diff -u -p -r1.173 Makefile.am
--- ld/Makefile.am	5 May 2005 14:37:24 -0000	1.173
+++ ld/Makefile.am	12 May 2005 17:18:52 -0000
@@ -103,6 +103,9 @@ info_TEXINFOS = ld.texinfo
 noinst_TEXINFOS = ldint.texinfo
 man_MANS = ld.1
 
+AM_MAKEINFOFLAGS = -I $(BFDDIR)/doc
+TEXI2DVI = texi2dvi -I $(BFDDIR)/doc
+
 INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) -I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) -DLOCALEDIR="\"$(datadir)/locale\""
 
 BFDLIB = ../bfd/libbfd.la
@@ -1630,17 +1633,12 @@ configdoc.texi:	${DOCVER}-doc.texi
 	  || ln ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi >/dev/null 2>&1 \
 	  || cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi
 
-ldver.texi: Makefile
+ldver.texi: $(srcdir)/../bfd/configure
 	rm -f $@
-	echo '@set VERSION $(VERSION)' > $@
-
-ld.info: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
-	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	$(MAKEINFO) -I $(srcdir) -I $(BFDDIR)/doc $(srcdir)/ld.texinfo
+	eval `grep '^ *VERSION=' $<`; echo "@set VERSION $$VERSION" > $@
 
+$(srcdir)/ld.info: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
 ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
-	TEXINPUTS=$(top_srcdir)/../texinfo:$$TEXINPUTS \
-	  MAKEINFO="$(MAKEINFO) -I $(srcdir) -I $(BFDDIR)/doc" $(TEXI2DVI) -I $(BFDDIR)/doc $(srcdir)/ld.texinfo
 
 # Build the man page from the texinfo file
 # The sed command removes the no-adjust Nroff command so that
@@ -1654,10 +1652,12 @@ ld.1: $(srcdir)/ld.texinfo configdoc.tex
 	        (rm -f $@.T$$$$ && exit 1)
 	rm -f ld.pod
 
-MAINTAINERCLEANFILES = ldver.texi
+MAINTAINERCLEANFILES = ldver.texi configdoc.texi
 
-# We want to reconfigure if configure.host or configure.tgt changes.
-CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host $(srcdir)/configure.tgt
+# We want to reconfigure if configure.host or configure.tgt changes.  We
+# extract version from bfd/configure.in, so we must depend on that also.
+CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host $(srcdir)/configure.tgt \
+	$(srcdir)/../bfd/configure.in
 
 MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \
 	ldemul-list.h crtbegin.o crtend.o ld.log ld.sum
@@ -1690,7 +1690,7 @@ install-data-local:
 
 # We want install to imply install-info as per GNU standards, despite the
 # cygnus option.
-install: install-info
+install-data-local: install-info
 
 # Stuff that should be included in a distribution.  The diststuff
 # target is run by the taz target in ../Makefile.in.
@@ -1701,8 +1701,6 @@ DISTCLEANFILES = tdirs site.exp site.bak
 distclean-local:
 	rm -rf ldscripts
 
-Makefile: $(BFDDIR)/configure.in
-
 # Targets to rebuild dependencies in this Makefile.
 # Have to get rid of DEP1 here so that "$?" later includes all of $(CFILES).
 DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
Index: ld/acinclude.m4
===================================================================
RCS file: /home/drow/rsync/src/src/ld/acinclude.m4,v
retrieving revision 1.2
diff -u -p -r1.2 acinclude.m4
--- ld/acinclude.m4	31 Aug 2000 09:45:09 -0000	1.2
+++ ld/acinclude.m4	12 May 2005 14:26:38 -0000
@@ -1,16 +1 @@
 sinclude(../bfd/acinclude.m4)
-
-dnl sinclude(../libtool.m4) already included in bfd/acinclude.m4
-dnl The lines below arrange for aclocal not to bring libtool.m4
-dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
-dnl to add a definition of LIBTOOL to Makefile.in.
-ifelse(yes,no,[
-AC_DEFUN([AM_PROG_LIBTOOL],)
-AC_SUBST(LIBTOOL)
-])
-
-dnl sinclude(../gettext.m4) already included in bfd/acinclude.m4
-ifelse(yes,no,[
-AC_DEFUN([CY_WITH_NLS],)
-AC_SUBST(INTLLIBS)
-])
Index: ld/configure.in
===================================================================
RCS file: /home/drow/rsync/src/src/ld/configure.in,v
retrieving revision 1.30
diff -u -p -r1.30 configure.in
--- ld/configure.in	14 Apr 2005 05:26:40 -0000	1.30
+++ ld/configure.in	12 May 2005 16:21:03 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script
 dnl
-AC_PREREQ(2.13)
+AC_PREREQ(2.57)
 AC_INIT(ldmain.c)
 
 AC_CANONICAL_SYSTEM
@@ -201,7 +201,7 @@ do
     all_targets=true
   else
     # Canonicalize the secondary target names.
-    result=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $targ_alias 2>/dev/null`
+    result=`$ac_config_sub $targ_alias 2>/dev/null`
     if test -n "$result"; then
 	targ=$result
     else
Index: gdb/Makefile.in
===================================================================
RCS file: /home/drow/rsync/src/src/gdb/Makefile.in,v
retrieving revision 1.726
diff -u -p -r1.726 Makefile.in
--- gdb/Makefile.in	2 May 2005 12:05:11 -0000	1.726
+++ gdb/Makefile.in	12 May 2005 14:31:30 -0000
@@ -1593,7 +1593,7 @@ po/$(PACKAGE).pot: force
 
 .SUFFIXES: .y .l
 .y.c: 
-	$(SHELL) $(YLWRAP) "$(YACC)" $< y.tab.c $@.tmp -- $(YFLAGS)
+	$(SHELL) $(YLWRAP) $< y.tab.c $@.tmp -- $(YACC) $(YFLAGS)
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]