[v3] gcc-3_1-branch configure sync

Benjamin Kosnik bkoz@redhat.com
Thu Jun 27 14:16:00 GMT 2002


DJ this allows me to rebuild configure. It's a straight copy of these
two acinclude.m4 macros into the branch.

tested x86/linux

2002-06-27  Benjamin Kosnik  <bkoz@redhat.com>

	* acinclude.m4: Fix last checkin.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.194.2.11
diff -c -p -r1.194.2.11 acinclude.m4
*** acinclude.m4	26 Jun 2002 04:15:31 -0000	1.194.2.11
--- acinclude.m4	27 Jun 2002 20:14:02 -0000
*************** dnl Initialize configure bits.
*** 3,9 ****
  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)],
    [case "${enableval}" in
--- 3,10 ----
  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,
    [  --enable-multilib       build hella library versions (default)],
    [case "${enableval}" in
*************** AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [
*** 33,39 ****
    AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
    toplevel_srcdir=\${top_srcdir}/$toprel
    AC_SUBST(toplevel_srcdir)
! )]
  
  dnl
  dnl Initialize configure bits.
--- 34,40 ----
    AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
    toplevel_srcdir=\${top_srcdir}/$toprel
    AC_SUBST(toplevel_srcdir)
! ])
  
  dnl
  dnl Initialize configure bits.
*************** dnl
*** 41,51 ****
  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
    # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
!   glibcpp_builddir=`pwd`
    case $srcdir in
    [\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;;
    *) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
--- 42,54 ----
  dnl GLIBCPP_CONFIGURE
  AC_DEFUN(GLIBCPP_CONFIGURE, [
  
+ #possibly test for the presence of the compiler sources here?
+ 
    # 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
    # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
!   glibcpp_builddir=`${PWDCMD-pwd}`
    case $srcdir in
    [\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;;
    *) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
*************** AC_DEFUN(GLIBCPP_CONFIGURE, [
*** 58,64 ****
  
    AC_PROG_AWK
    # Will set LN_S to either 'ln -s' or 'ln'.  With autoconf 2.5x, can also
!   # be 'cp -p' if linking isn't available.
    #ac_cv_prog_LN_S='cp -p'
    AC_PROG_LN_S
  
--- 61,68 ----
  
    AC_PROG_AWK
    # Will set LN_S to either 'ln -s' or 'ln'.  With autoconf 2.5x, can also
!   # be 'cp -p' if linking isn't available.  Uncomment the next line to
!   # force a particular method.
    #ac_cv_prog_LN_S='cp -p'
    AC_PROG_LN_S
  
*************** AC_DEFUN(GLIBCPP_CONFIGURE, [
*** 188,201 ****
      AC_EXEEXT
    fi
  
-   . [$]{glibcpp_basedir}/configure.host
- 
    case [$]{glibcpp_basedir} in
      /* | [A-Za-z]:[\\/]*) libgcj_flagbasedir=[$]{glibcpp_basedir} ;;
      *) glibcpp_flagbasedir='[$](top_builddir)/'[$]{glibcpp_basedir} ;;
    esac
  
!   # This does for the target what configure.host does for the host.  In
    # addition to possibly modifying the same flags, it also sets up symlinks.
    GLIBCPP_CHECK_TARGET
  
--- 192,203 ----
      AC_EXEEXT
    fi
  
    case [$]{glibcpp_basedir} in
      /* | [A-Za-z]:[\\/]*) libgcj_flagbasedir=[$]{glibcpp_basedir} ;;
      *) glibcpp_flagbasedir='[$](top_builddir)/'[$]{glibcpp_basedir} ;;
    esac
  
!   # Find platform-specific directories containing configuration info.  In
    # addition to possibly modifying the same flags, it also sets up symlinks.
    GLIBCPP_CHECK_TARGET
  



More information about the Gcc-patches mailing list