OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

acinclude.m4: Move certain code to configure.in. 

* acinclude.m4: Move certain code to configure.in.
	* configure.in: Receive code from acinclude.m4.
	* aclocal.m4: Rebuild.
	* configure: Regenerate.

From-SVN: r78144
This commit is contained in:
Nathanael Nerode 2004-02-20 03:11:01 +00:00
parent 515927826c
commit b1891e51b8
5 changed files with 339 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boehm-gc/ChangeLog
View File

@ -1,5 +1,10 @@
2004-02-19 Nathanael Nerode <neroden@gcc.gnu.org>
* acinclude.m4: Move certain code to configure.in.
* configure.in: Receive code from acinclude.m4.
* aclocal.m4: Rebuild.
* configure: Regenerate.
* Makefile.direct, alloc.c: Resync to upstream 6.3 alpha 1.
2004-01-20 Andrew Haley <aph@redhat.com>

35
boehm-gc/acinclude.m4
View File

@ -19,41 +19,6 @@
AC_DEFUN(GC_CONFIGURE,
[
dnl Default to --enable-multilib
AC_ARG_ENABLE(multilib,
[ --enable-multilib build many library versions (default)],
[case "${enableval}" in
yes) multilib=yes ;;
no) multilib=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
esac], [multilib=yes])dnl
dnl We may get other options which we don't document:
dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
dnl I needed to add the -n test to allow configuration in src directory - HB
if test "[$]{srcdir}" = "."; then
if test "[$]{with_target_subdir}" != "." -a -n "[$]{with_target_subdir}"; then
gc_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
else
gc_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
fi
else
gc_basedir="[$]{srcdir}/$1"
fi
AC_SUBST(gc_basedir)
AC_CONFIG_AUX_DIR($gc_basedir/..)
if :; then :; else
# This overrides the previous occurrence for automake, but not for
# autoconf, which is exactly what we want.
AC_CONFIG_AUX_DIR(..)
fi
AC_CANONICAL_SYSTEM
# This works around an automake problem.
mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
AC_SUBST(mkinstalldirs)
AM_INIT_AUTOMAKE(gc, 6.1a1, no-define)

35
boehm-gc/aclocal.m4 vendored
View File

@ -31,41 +31,6 @@ dnl PARTICULAR PURPOSE.
AC_DEFUN(GC_CONFIGURE,
[
dnl Default to --enable-multilib
AC_ARG_ENABLE(multilib,
[ --enable-multilib build many library versions (default)],
[case "${enableval}" in
yes) multilib=yes ;;
no) multilib=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
esac], [multilib=yes])dnl
dnl We may get other options which we don't document:
dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
dnl I needed to add the -n test to allow configuration in src directory - HB
if test "[$]{srcdir}" = "."; then
if test "[$]{with_target_subdir}" != "." -a -n "[$]{with_target_subdir}"; then
gc_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
else
gc_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
fi
else
gc_basedir="[$]{srcdir}/$1"
fi
AC_SUBST(gc_basedir)
AC_CONFIG_AUX_DIR($gc_basedir/..)
if :; then :; else
# This overrides the previous occurrence for automake, but not for
# autoconf, which is exactly what we want.
AC_CONFIG_AUX_DIR(..)
fi
AC_CANONICAL_SYSTEM
# This works around an automake problem.
mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
AC_SUBST(mkinstalldirs)
AM_INIT_AUTOMAKE(gc, 6.0, no-define)

593
boehm-gc/configure vendored
View File

File diff suppressed because it is too large Load Diff

38
boehm-gc/configure.in
View File

@ -22,9 +22,45 @@ AC_INIT(gcj_mlc.c)
# exported.
ORIGINAL_LD_FOR_MULTILIBS=$LD
dnl Can't be done in GC_CONFIGURE because that confuses automake.
dnl Can't be done in GC_CONFIGURE because that confuses automake.
AC_CONFIG_AUX_DIR(.)
dnl Default to --enable-multilib
AC_ARG_ENABLE(multilib,
[ --enable-multilib build many library versions (default)],
[case "${enableval}" in
yes) multilib=yes ;;
no) multilib=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
esac], [multilib=yes])dnl
dnl We may get other options which we don't document:
dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
dnl I needed to add the -n test to allow configuration in src directory - HB
if test "[$]{srcdir}" = "."; then
if test "[$]{with_target_subdir}" != "." -a -n "[$]{with_target_subdir}"; then
gc_basedir="[$]{srcdir}/[$]{with_multisrctop}../."
else
gc_basedir="[$]{srcdir}/[$]{with_multisrctop}."
fi
else
gc_basedir="[$]{srcdir}/."
fi
AC_SUBST(gc_basedir)
AC_CONFIG_AUX_DIR($gc_basedir/..)
if :; then :; else
# This overrides the previous occurrence for automake, but not for
# autoconf, which is exactly what we want.
AC_CONFIG_AUX_DIR(..)
fi
AC_CANONICAL_SYSTEM
# This works around an automake problem.
mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
AC_SUBST(mkinstalldirs)
GC_CONFIGURE(.)
AM_PROG_LIBTOOL