srcdir builds

DJ Delorie dj@redhat.com
Tue Jun 25 23:13:00 GMT 2002


Ok, here's the final patch (minus configure regen) for 3.1,
as applied:

2002-06-25  DJ Delorie  <dj@redhat.com>

	* aclocal.m4 (GLIBCPP_CONFIGURE): Split out
	GLIBCPP_TOPREL_CONFIGURE.
	* configure.in: Call it before AC_CANONICAL_SYSTEM.
	* configure: Regenerate.

2002-06-25  DJ Delorie  <dj@redhat.com>

	* aclocal.m4 (GLIBCPP_CONFIGURE): Split out
	GLIBCPP_TOPREL_CONFIGURE.
	* configure.in: Call it before AC_CANONICAL_SYSTEM.
	* configure: Regenerate.

2002-06-25  DJ Delorie  <dj@redhat.com>

	* acinclude.m4 (GLIBCPP_CONFIGURE): Split out
	GLIBCPP_TOPREL_CONFIGURE.
	* aclocal.m4: Likewise.
	* configure.in: Call it before AC_CANONICAL_SYSTEM.
	* configure: Regenerate.

Index: libf2c/aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/libf2c/aclocal.m4,v
retrieving revision 1.2.2.1
diff -p -3 -r1.2.2.1 aclocal.m4
*** libf2c/aclocal.m4	15 Apr 2002 21:57:52 -0000	1.2.2.1
--- libf2c/aclocal.m4	26 Jun 2002 04:09:32 -0000
*************** dnl PARTICULAR PURPOSE.
*** 11,18 ****
  dnl
  dnl Initialize configure bits.
  dnl
! dnl GLIBCPP_CONFIGURE
! AC_DEFUN(GLIBCPP_CONFIGURE, [
    dnl Default to --enable-multilib
    AC_ARG_ENABLE(multilib,
    [  --enable-multilib       build hella library versions (default)],
--- 11,18 ----
  dnl
  dnl Initialize configure bits.
  dnl
! dnl GLIBCPP_TOPREL_CONFIGURE
! AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [
    dnl Default to --enable-multilib
    AC_ARG_ENABLE(multilib,
    [  --enable-multilib       build hella library versions (default)],
*************** fi
*** 43,49 ****
--- 43,55 ----
  AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
  toplevel_srcdir=\${top_srcdir}/$toprel
  AC_SUBST(toplevel_srcdir)
+ ])
  
+ dnl
+ dnl Initialize configure bits.
+ dnl
+ dnl GLIBCPP_CONFIGURE
+ AC_DEFUN(GLIBCPP_CONFIGURE, [
  # Export build and source directories.
  # These need to be absolute paths, yet at the same time need to
  # canonicalize only relative paths, because then amd will not unmount
Index: libf2c/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libf2c/configure.in,v
retrieving revision 1.31.2.1
diff -p -3 -r1.31.2.1 configure.in
*** libf2c/configure.in	8 May 2002 04:25:36 -0000	1.31.2.1
--- libf2c/configure.in	26 Jun 2002 04:09:32 -0000
*************** AC_INIT(libF77/Version.c)
*** 28,33 ****
--- 28,35 ----
  # exported.
  ORIGINAL_LD_FOR_MULTILIBS=$LD
  
+ GLIBCPP_TOPREL_CONFIGURE
+ 
  AC_CANONICAL_SYSTEM
  target_alias=${target_alias-$target}
  AC_SUBST(target_alias)
Index: libobjc/aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/libobjc/aclocal.m4,v
retrieving revision 1.3
diff -p -3 -r1.3 aclocal.m4
*** libobjc/aclocal.m4	11 Feb 2002 18:10:05 -0000	1.3
--- libobjc/aclocal.m4	26 Jun 2002 04:09:34 -0000
*************** dnl PARTICULAR PURPOSE.
*** 11,18 ****
  dnl
  dnl Initialize configure bits.
  dnl
! dnl GLIBCPP_CONFIGURE
! AC_DEFUN(GLIBCPP_CONFIGURE, [
    dnl Default to --enable-multilib
    AC_ARG_ENABLE(multilib,
    [  --enable-multilib       build hella library versions (default)],
--- 11,18 ----
  dnl
  dnl Initialize configure bits.
  dnl
! dnl GLIBCPP_TOPREL_CONFIGURE
! AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [
    dnl Default to --enable-multilib
    AC_ARG_ENABLE(multilib,
    [  --enable-multilib       build hella library versions (default)],
*************** fi
*** 43,49 ****
--- 43,55 ----
  AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
  toplevel_srcdir=\${top_srcdir}/$toprel
  AC_SUBST(toplevel_srcdir)
+ ])
  
+ dnl
+ dnl Initialize configure bits.
+ dnl
+ dnl GLIBCPP_CONFIGURE
+ AC_DEFUN(GLIBCPP_CONFIGURE, [
  # Export build and source directories.
  # These need to be absolute paths, yet at the same time need to
  # canonicalize only relative paths, because then amd will not unmount
Index: libobjc/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libobjc/configure.in,v
retrieving revision 1.16.2.1
diff -p -3 -r1.16.2.1 configure.in
*** libobjc/configure.in	8 May 2002 04:27:29 -0000	1.16.2.1
--- libobjc/configure.in	26 Jun 2002 04:09:34 -0000
*************** AC_CONFIG_HEADER(config.h)
*** 29,34 ****
--- 29,36 ----
  # exported.
  ORIGINAL_LD_FOR_MULTILIBS=$LD
  
+ GLIBCPP_TOPREL_CONFIGURE
+ 
  AC_CANONICAL_SYSTEM
  target_alias=${target_alias-$target}
  AC_SUBST(target_alias)
Index: libstdc++-v3/acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.194.2.10
diff -p -3 -r1.194.2.10 acinclude.m4
*** libstdc++-v3/acinclude.m4	27 May 2002 15:01:25 -0000	1.194.2.10
--- libstdc++-v3/acinclude.m4	26 Jun 2002 04:09:36 -0000
***************
*** 1,8 ****
  dnl
  dnl Initialize configure bits.
  dnl
! dnl GLIBCPP_CONFIGURE
! AC_DEFUN(GLIBCPP_CONFIGURE, [
    dnl Default to --enable-multilib
    AC_ARG_ENABLE(multilib,
    [  --enable-multilib       build hella library versions (default)],
--- 1,8 ----
  dnl
  dnl Initialize configure bits.
  dnl
! dnl GLIBCPP_TOPREL_CONFIGURE
! AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [
    dnl Default to --enable-multilib
    AC_ARG_ENABLE(multilib,
    [  --enable-multilib       build hella library versions (default)],
*************** AC_DEFUN(GLIBCPP_CONFIGURE, [
*** 33,38 ****
--- 33,45 ----
    AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
    toplevel_srcdir=\${top_srcdir}/$toprel
    AC_SUBST(toplevel_srcdir)
+ )]
+ 
+ dnl
+ dnl Initialize configure bits.
+ dnl
+ dnl GLIBCPP_CONFIGURE
+ AC_DEFUN(GLIBCPP_CONFIGURE, [
  
    # Export build and source directories.
    # These need to be absolute paths, yet at the same time need to
Index: libstdc++-v3/aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/aclocal.m4,v
retrieving revision 1.202.2.11
diff -p -3 -r1.202.2.11 aclocal.m4
*** libstdc++-v3/aclocal.m4	14 Jun 2002 18:42:23 -0000	1.202.2.11
--- libstdc++-v3/aclocal.m4	26 Jun 2002 04:09:37 -0000
*************** dnl PARTICULAR PURPOSE.
*** 13,20 ****
  dnl
  dnl Initialize configure bits.
  dnl
! dnl GLIBCPP_CONFIGURE
! AC_DEFUN(GLIBCPP_CONFIGURE, [
    dnl Default to --enable-multilib
    AC_ARG_ENABLE(multilib,
    [  --enable-multilib       build hella library versions (default)],
--- 13,20 ----
  dnl
  dnl Initialize configure bits.
  dnl
! dnl GLIBCPP_TOPREL_CONFIGURE
! AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [
    dnl Default to --enable-multilib
    AC_ARG_ENABLE(multilib,
    [  --enable-multilib       build hella library versions (default)],
*************** AC_DEFUN(GLIBCPP_CONFIGURE, [
*** 45,50 ****
--- 45,57 ----
    AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
    toplevel_srcdir=\${top_srcdir}/$toprel
    AC_SUBST(toplevel_srcdir)
+ ])
+ 
+ dnl
+ dnl Initialize configure bits.
+ dnl
+ dnl GLIBCPP_CONFIGURE
+ AC_DEFUN(GLIBCPP_CONFIGURE, [
  
    # Export build and source directories.
    # These need to be absolute paths, yet at the same time need to
Index: libstdc++-v3/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.in,v
retrieving revision 1.83.2.10
diff -p -3 -r1.83.2.10 configure.in
*** libstdc++-v3/configure.in	14 Jun 2002 18:43:35 -0000	1.83.2.10
--- libstdc++-v3/configure.in	26 Jun 2002 04:09:37 -0000
*************** AC_SUBST(release_VERSION)
*** 19,24 ****
--- 19,26 ----
  libtool_VERSION=4:1:0
  AC_SUBST(libtool_VERSION)
  
+ GLIBCPP_TOPREL_CONFIGURE
+ 
  # Gets build, host, target, *_vendor, *_cpu, *_os, etc.
  # AC 2.5x sets target_alias iff the user specified --target, but we use it
  # everywhere, so we set it here just to be sure.  In AC 2.13



More information about the Gcc-patches mailing list