srcdir builds

DJ Delorie dj@redhat.com
Tue Jun 25 21:14:00 GMT 2002


Ok, here's the final patch (minus configure regen) for mainline,
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.4
diff -p -3 -r1.4 aclocal.m4
*** libf2c/aclocal.m4	16 May 2002 17:42:48 -0000	1.4
--- libf2c/aclocal.m4	26 Jun 2002 03:34:05 -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.32
diff -p -3 -r1.32 configure.in
*** libf2c/configure.in	8 May 2002 04:36:28 -0000	1.32
--- libf2c/configure.in	26 Jun 2002 03:34:05 -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.4
diff -p -3 -r1.4 aclocal.m4
*** libobjc/aclocal.m4	16 May 2002 17:42:58 -0000	1.4
--- libobjc/aclocal.m4	26 Jun 2002 03:34:06 -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.17
diff -p -3 -r1.17 configure.in
*** libobjc/configure.in	8 May 2002 04:37:26 -0000	1.17
--- libobjc/configure.in	26 Jun 2002 03:34:06 -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.210
diff -p -3 -r1.210 acinclude.m4
*** libstdc++-v3/acinclude.m4	20 Jun 2002 19:07:20 -0000	1.210
--- libstdc++-v3/acinclude.m4	26 Jun 2002 03:34:08 -0000
***************
*** 1,8 ****
  dnl
  dnl Initialize configure bits.
  dnl
! dnl GLIBCPP_CONFIGURE
! AC_DEFUN(GLIBCPP_CONFIGURE, [
    dnl Default to --enable-multilib (this is also passed by default
    dnl from the ubercommon-top-level configure)
    AC_ARG_ENABLE(multilib,
--- 1,8 ----
  dnl
  dnl Initialize configure bits.
  dnl
! dnl GLIBCPP_TOPREL_CONFIGURE
! AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [
    dnl Default to --enable-multilib (this is also passed by default
    dnl from the ubercommon-top-level configure)
    AC_ARG_ENABLE(multilib,
*************** AC_DEFUN(GLIBCPP_CONFIGURE, [
*** 34,39 ****
--- 34,46 ----
    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, [
  
  #possibly test for the presence of the compiler sources here?
  
Index: libstdc++-v3/aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/aclocal.m4,v
retrieving revision 1.221
diff -p -3 -r1.221 aclocal.m4
*** libstdc++-v3/aclocal.m4	20 Jun 2002 19:07:21 -0000	1.221
--- libstdc++-v3/aclocal.m4	26 Jun 2002 03:34:08 -0000
*************** dnl PARTICULAR PURPOSE.
*** 13,20 ****
  dnl
  dnl Initialize configure bits.
  dnl
! dnl GLIBCPP_CONFIGURE
! AC_DEFUN(GLIBCPP_CONFIGURE, [
    dnl Default to --enable-multilib (this is also passed by default
    dnl from the ubercommon-top-level configure)
    AC_ARG_ENABLE(multilib,
--- 13,20 ----
  dnl
  dnl Initialize configure bits.
  dnl
! dnl GLIBCPP_TOPREL_CONFIGURE
! AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [
    dnl Default to --enable-multilib (this is also passed by default
    dnl from the ubercommon-top-level configure)
    AC_ARG_ENABLE(multilib,
*************** AC_DEFUN(GLIBCPP_CONFIGURE, [
*** 46,51 ****
--- 46,58 ----
    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, [
  
  #possibly test for the presence of the compiler sources here?
  
Index: libstdc++-v3/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.in,v
retrieving revision 1.99
diff -p -3 -r1.99 configure.in
*** libstdc++-v3/configure.in	24 Jun 2002 05:47:02 -0000	1.99
--- libstdc++-v3/configure.in	26 Jun 2002 03:34:08 -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.
  #
  # You will slowly go insane if you do not grok the following fact:  when



More information about the Gcc-patches mailing list