This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils 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]

Re: Update autoconf for gas


On Thu, Aug 28, 2003 at 10:02:30PM -0400, Daniel Jacobowitz wrote:
> i386-linux native.  Yeah, I'm getting lame, it's late.
> 
> Further testing found a problem with the ylwrap handling after all.

Updated version, with annoyed comment explaining the difficulty.

-- 
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer

2003-08-28  Daniel Jacobowitz  <drow@mvista.com>

	* configure.in: Update AC_PREREQ to 2.57.  Use AC_CONFIG_FILES
	and AC_CONFIG_COMMANDS instead of the three-argument AC_OUTPUT.
	Specify AC_CONFIG_AUX_DIR.
	* configure: Regenerated with autoconf 2.57.
	* aclocal.m4: Regenerated with aclocal-1.7.
	* Makefile.in, doc/Makefile.in: Regenerated with automake-1.7.

Index: configure.in
===================================================================
RCS file: /big/fsf/rsync/src-cvs/src/gas/configure.in,v
retrieving revision 1.136
diff -u -p -r1.136 configure.in
--- configure.in	10 Jul 2003 04:44:55 -0000	1.136
+++ configure.in	29 Aug 2003 02:12:35 -0000
@@ -5,9 +5,13 @@ dnl brackets, be sure changequote invoca
 dnl
 dnl
 dnl v2.5 needed for --bindir et al
-AC_PREREQ(2.13)
+AC_PREREQ(2.57)
 AC_INIT(as.h)
 
+dnl Autoconf 2.57 will find the aux dir without this.  However, unless
+dnl we specify this explicitly, automake-1.7 will assume that ylwrap is in
+dnl gas/ instead of gas/../.
+AC_CONFIG_AUX_DIR(..)
 AC_CANONICAL_SYSTEM
 AC_ISC_POSIX
 
@@ -70,10 +74,14 @@ AM_CONFIG_HEADER(config.h:config.in)
 
 # If we are on a DOS filesystem, we must use gdb.ini rather than
 # .gdbinit.
-GDBINIT=".gdbinit"
 case "${host}" in
   *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-windows*)
     GDBINIT="gdb.ini"
+    AC_CONFIG_FILES(gdb.ini:gdbinit.in)
+    ;;
+  *)
+    GDBINIT=".gdbinit"
+    AC_CONFIG_FILES(.gdbinit:gdbinit.in)
     ;;
 esac
 AC_SUBST(GDBINIT)
@@ -1045,7 +1053,8 @@ dnl the build directory which include th
 dnl the old symlinks don't exist, so that a reconfigure in an existing
 dnl directory behaves reasonably.
 
-AC_OUTPUT(Makefile doc/Makefile ${GDBINIT}:gdbinit.in po/Makefile.in:po/Make-in,
+AC_CONFIG_FILES(Makefile doc/Makefile po/Makefile.in:po/Make-in)
+AC_CONFIG_COMMANDS([default],
 [rm -f targ-cpu.c targ-cpu.h obj-format.h obj-format.c targ-env.h atof-targ.c itbl-cpu.h
  echo '#include "tc-'"${target_cpu_type}"'.h"' > targ-cpu.h
  echo '#include "obj-'"${obj_format}"'.h"' > obj-format.h
@@ -1060,3 +1069,5 @@ AC_OUTPUT(Makefile doc/Makefile ${GDBINI
  cgen_cpu_prefix=${cgen_cpu_prefix}
  obj_format=${obj_format}
  te_file=${te_file}])
+
+AC_OUTPUT


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