diff options
author | Mike Frysinger <vapier@gentoo.org> | 2022-01-23 23:24:52 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2022-02-01 23:07:11 -0500 |
commit | 8622002ffc71ff5777a7221232ba02c7a7e7d004 (patch) | |
tree | 7733e63e5264de6215e27a5dc937a6bbabd5ba34 /libgloss | |
parent | 30f244155b8e82aa948ddcb8f2350654fc1adb92 (diff) | |
download | newlib-8622002ffc71ff5777a7221232ba02c7a7e7d004.zip newlib-8622002ffc71ff5777a7221232ba02c7a7e7d004.tar.gz newlib-8622002ffc71ff5777a7221232ba02c7a7e7d004.tar.bz2 |
libgloss: move to ../config/multi.m4 for multilib logic
The current libgloss multilib logic is almost exactly the same as the
config/multi.m4, and the differences should be minor, so switch over
to that to delete custom logic on ourside.
The insertions here look larger and that's because none of the scripts
were declaring --enable-multilib explicitly even though they checked the
flag and changed behavior.
Diffstat (limited to 'libgloss')
39 files changed, 868 insertions, 247 deletions
diff --git a/libgloss/aarch64/aclocal.m4 b/libgloss/aarch64/aclocal.m4 index 24271f3..fab8217 100644 --- a/libgloss/aarch64/aclocal.m4 +++ b/libgloss/aarch64/aclocal.m4 @@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) m4_include([../../config/depstand.m4]) m4_include([../../config/lead-dot.m4]) +m4_include([../../config/multi.m4]) m4_include([../../config/override.m4]) m4_include([../acinclude.m4]) diff --git a/libgloss/aarch64/configure b/libgloss/aarch64/configure index 7238627..969a004 100755 --- a/libgloss/aarch64/configure +++ b/libgloss/aarch64/configure @@ -585,6 +585,7 @@ ac_unique_file="crt0.S" enable_option_checking=no ac_subst_vars='LTLIBOBJS LIBOBJS +multi_basedir subdirs host_makefile_frag_path objtype @@ -663,6 +664,7 @@ ac_subst_files='host_makefile_frag' ac_user_opts=' enable_option_checking enable_dependency_tracking +enable_multilib ' ac_precious_vars='build_alias host_alias @@ -1290,6 +1292,7 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-multilib build many library versions (default) Some influential environment variables: CCAS assembler compiler command (defaults to CC) @@ -2561,6 +2564,44 @@ subdirs="$subdirs cpu-init" fi +# Default to --enable-multilib +# Check whether --enable-multilib was given. +if test "${enable_multilib+set}" = set; then : + enableval=$enable_multilib; case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;; + esac +else + multilib=yes +fi + + +# We may get other options which we leave undocumented: +# --with-target-subdir, --with-multisrctop, --with-multisubdir +# See config-ml.in if you want the gory details. + +if test "$srcdir" = "."; then + if test "$with_target_subdir" != "."; then + multi_basedir="$srcdir/$with_multisrctop../../.." + else + multi_basedir="$srcdir/$with_multisrctop../.." + fi +else + multi_basedir="$srcdir/../.." +fi + + +# Even if the default multilib is not a cross compilation, +# it may be that some of the other multilibs are. +if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe +fi + +ac_config_commands="$ac_config_commands default-1" + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -3277,12 +3318,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +srcdir="$srcdir" +host="$host" +target="$target" +with_multisubdir="$with_multisubdir" +with_multisrctop="$with_multisrctop" +with_target_subdir="$with_target_subdir" +ac_configure_args="${multilib_arg} ${ac_configure_args}" +multi_basedir="$multi_basedir" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" _ACEOF @@ -3293,6 +3342,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -3849,7 +3899,14 @@ $as_echo X"$file" | done } ;; - "Makefile":F) . ${srcdir}/../../config-ml.in ;; + "default-1":C) +# Only add multilib support code if we just rebuilt the top-level +# Makefile. +case " $CONFIG_FILES " in + *" Makefile "*) + ac_file=Makefile . ${multi_basedir}/config-ml.in + ;; +esac ;; esac done # for ac_tag diff --git a/libgloss/aarch64/configure.ac b/libgloss/aarch64/configure.ac index 303e513..b26f55e 100644 --- a/libgloss/aarch64/configure.ac +++ b/libgloss/aarch64/configure.ac @@ -43,12 +43,7 @@ if test -d "${srcdir}/cpu-init"; then AC_SUBST(subdirs) fi -AC_CONFIG_FILES(Makefile, -. ${srcdir}/../../config-ml.in, -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -) +AM_ENABLE_MULTILIB(, ../..) + +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/libgloss/aarch64/cpu-init/aclocal.m4 b/libgloss/aarch64/cpu-init/aclocal.m4 index 5ca7019..ee5abac 100644 --- a/libgloss/aarch64/cpu-init/aclocal.m4 +++ b/libgloss/aarch64/cpu-init/aclocal.m4 @@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) m4_include([../../../config/depstand.m4]) m4_include([../../../config/lead-dot.m4]) +m4_include([../../../config/multi.m4]) m4_include([../../../config/override.m4]) m4_include([../../acinclude.m4]) diff --git a/libgloss/aarch64/cpu-init/configure b/libgloss/aarch64/cpu-init/configure index c815971..7b03053 100755 --- a/libgloss/aarch64/cpu-init/configure +++ b/libgloss/aarch64/cpu-init/configure @@ -584,6 +584,7 @@ PACKAGE_URL= ac_unique_file="Makefile.in" ac_subst_vars='LTLIBOBJS LIBOBJS +multi_basedir host_makefile_frag_path CCASFLAGS CCAS @@ -660,6 +661,7 @@ ac_subst_files='host_makefile_frag' ac_user_opts=' enable_option_checking enable_dependency_tracking +enable_multilib ' ac_precious_vars='build_alias host_alias @@ -1287,6 +1289,7 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-multilib build many library versions (default) Some influential environment variables: CCAS assembler compiler command (defaults to CC) @@ -2540,6 +2543,44 @@ host_makefile_frag_path=$host_makefile_frag +# Default to --enable-multilib +# Check whether --enable-multilib was given. +if test "${enable_multilib+set}" = set; then : + enableval=$enable_multilib; case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;; + esac +else + multilib=yes +fi + + +# We may get other options which we leave undocumented: +# --with-target-subdir, --with-multisrctop, --with-multisubdir +# See config-ml.in if you want the gory details. + +if test "$srcdir" = "."; then + if test "$with_target_subdir" != "."; then + multi_basedir="$srcdir/$with_multisrctop../../../.." + else + multi_basedir="$srcdir/$with_multisrctop../../.." + fi +else + multi_basedir="$srcdir/../../.." +fi + + +# Even if the default multilib is not a cross compilation, +# it may be that some of the other multilibs are. +if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe +fi + +ac_config_commands="$ac_config_commands default-1" + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -3256,12 +3297,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +srcdir="$srcdir" +host="$host" +target="$target" +with_multisubdir="$with_multisubdir" +with_multisrctop="$with_multisrctop" +with_target_subdir="$with_target_subdir" +ac_configure_args="${multilib_arg} ${ac_configure_args}" +multi_basedir="$multi_basedir" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" _ACEOF @@ -3272,6 +3321,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -3828,7 +3878,14 @@ $as_echo X"$file" | done } ;; - "Makefile":F) . ${srcdir}/../../../config-ml.in ;; + "default-1":C) +# Only add multilib support code if we just rebuilt the top-level +# Makefile. +case " $CONFIG_FILES " in + *" Makefile "*) + ac_file=Makefile . ${multi_basedir}/config-ml.in + ;; +esac ;; esac done # for ac_tag diff --git a/libgloss/aarch64/cpu-init/configure.ac b/libgloss/aarch64/cpu-init/configure.ac index 91aa221..91f9c70 100644 --- a/libgloss/aarch64/cpu-init/configure.ac +++ b/libgloss/aarch64/cpu-init/configure.ac @@ -28,12 +28,7 @@ host_makefile_frag_path=$host_makefile_frag AC_SUBST(host_makefile_frag_path) AC_SUBST_FILE(host_makefile_frag) -AC_CONFIG_FILES(Makefile, -. ${srcdir}/../../../config-ml.in, -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -) +AM_ENABLE_MULTILIB(, ../../..) + +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/libgloss/aclocal.m4 b/libgloss/aclocal.m4 index 3b8142a..6f7b7f7 100644 --- a/libgloss/aclocal.m4 +++ b/libgloss/aclocal.m4 @@ -1133,5 +1133,6 @@ AC_SUBST([am__untar]) m4_include([../config/depstand.m4]) m4_include([../config/lead-dot.m4]) +m4_include([../config/multi.m4]) m4_include([../config/override.m4]) m4_include([acinclude.m4]) diff --git a/libgloss/arm/aclocal.m4 b/libgloss/arm/aclocal.m4 index 24271f3..fab8217 100644 --- a/libgloss/arm/aclocal.m4 +++ b/libgloss/arm/aclocal.m4 @@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) m4_include([../../config/depstand.m4]) m4_include([../../config/lead-dot.m4]) +m4_include([../../config/multi.m4]) m4_include([../../config/override.m4]) m4_include([../acinclude.m4]) diff --git a/libgloss/arm/configure b/libgloss/arm/configure index bfa8bdb..8e3866b 100755 --- a/libgloss/arm/configure +++ b/libgloss/arm/configure @@ -584,6 +584,7 @@ PACKAGE_URL= ac_unique_file="redboot-crt0.S" ac_subst_vars='LTLIBOBJS LIBOBJS +multi_basedir subdirs host_makefile_frag_path objtype @@ -665,6 +666,7 @@ ac_user_opts=' enable_option_checking enable_newlib_supplied_syscalls enable_dependency_tracking +enable_multilib ' ac_precious_vars='build_alias host_alias @@ -1293,6 +1295,7 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-multilib build many library versions (default) Some influential environment variables: CCAS assembler compiler command (defaults to CC) @@ -2587,6 +2590,44 @@ if test -d "${srcdir}/cpu-init"; then fi +# Default to --enable-multilib +# Check whether --enable-multilib was given. +if test "${enable_multilib+set}" = set; then : + enableval=$enable_multilib; case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;; + esac +else + multilib=yes +fi + + +# We may get other options which we leave undocumented: +# --with-target-subdir, --with-multisrctop, --with-multisubdir +# See config-ml.in if you want the gory details. + +if test "$srcdir" = "."; then + if test "$with_target_subdir" != "."; then + multi_basedir="$srcdir/$with_multisrctop../../.." + else + multi_basedir="$srcdir/$with_multisrctop../.." + fi +else + multi_basedir="$srcdir/../.." +fi + + +# Even if the default multilib is not a cross compilation, +# it may be that some of the other multilibs are. +if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe +fi + +ac_config_commands="$ac_config_commands default-1" + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -3303,18 +3344,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -srcdir=${srcdir} - target=${target} - with_multisubdir=${with_multisubdir} - ac_configure_args="${ac_configure_args} --enable-multilib" - CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +srcdir="$srcdir" +host="$host" +target="$target" +with_multisubdir="$with_multisubdir" +with_multisrctop="$with_multisrctop" +with_target_subdir="$with_target_subdir" +ac_configure_args="${multilib_arg} ${ac_configure_args}" +multi_basedir="$multi_basedir" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" _ACEOF @@ -3326,6 +3369,7 @@ do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "cpu-init/Makefile") CONFIG_FILES="$CONFIG_FILES cpu-init/Makefile" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -3882,8 +3926,14 @@ $as_echo X"$file" | done } ;; - "cpu-init/Makefile":F) . ${srcdir}/../../config-ml.in ;; - "Makefile":F) . ${srcdir}/../../config-ml.in ;; + "default-1":C) +# Only add multilib support code if we just rebuilt the top-level +# Makefile. +case " $CONFIG_FILES " in + *" Makefile "*) + ac_file=Makefile . ${multi_basedir}/config-ml.in + ;; +esac ;; esac done # for ac_tag @@ -3922,4 +3972,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - diff --git a/libgloss/arm/configure.ac b/libgloss/arm/configure.ac index 806020b..2b98b54 100644 --- a/libgloss/arm/configure.ac +++ b/libgloss/arm/configure.ac @@ -62,24 +62,11 @@ AC_SUBST_FILE(host_makefile_frag) # Configure cpu init plug-ins if test -d "${srcdir}/cpu-init"; then subdirs="${subdirs} cpu-init" - AC_CONFIG_FILES(cpu-init/Makefile, - . ${srcdir}/../../config-ml.in, - srcdir=${srcdir} - target=${target} - with_multisubdir=${with_multisubdir} - ac_configure_args="${ac_configure_args} --enable-multilib" - CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - ) + AC_CONFIG_FILES([cpu-init/Makefile]) AC_SUBST(subdirs) fi -AC_CONFIG_FILES(Makefile, -. ${srcdir}/../../config-ml.in, -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -) -AC_OUTPUT +AM_ENABLE_MULTILIB(, ../..) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/libgloss/configure b/libgloss/configure index d197679..3fc20d6 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -587,6 +587,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +multi_basedir target_makefile_frag_path host_makefile_frag_path CPP @@ -697,6 +698,7 @@ ac_user_opts=' enable_option_checking enable_silent_rules enable_dependency_tracking +enable_multilib ' ac_precious_vars='build_alias host_alias @@ -1345,6 +1347,7 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-multilib build many library versions (default) Some influential environment variables: CCAS assembler compiler command (defaults to CC) @@ -4791,13 +4794,44 @@ target_makefile_frag_path=$target_makefile_frag -if test "${multilib}" = "yes"; then - multilib_arg="--enable-multilib" +# Default to --enable-multilib +# Check whether --enable-multilib was given. +if test "${enable_multilib+set}" = set; then : + enableval=$enable_multilib; case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;; + esac else - multilib_arg= + multilib=yes fi -# for now, only add multilibs for specific targets + +# We may get other options which we leave undocumented: +# --with-target-subdir, --with-multisrctop, --with-multisubdir +# See config-ml.in if you want the gory details. + +if test "$srcdir" = "."; then + if test "$with_target_subdir" != "."; then + multi_basedir="$srcdir/$with_multisrctop../.." + else + multi_basedir="$srcdir/$with_multisrctop.." + fi +else + multi_basedir="$srcdir/.." +fi + + +# Even if the default multilib is not a cross compilation, +# it may be that some of the other multilibs are. +if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe +fi + +ac_config_commands="$ac_config_commands default-1" + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -5520,15 +5554,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -srcdir=${srcdir} -target=${target} -host=${host} -with_multisubdir=${with_multisubdir} -ac_configure_args="--enable-multilib ${ac_configure_args}" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -CC="${CC}" -LDFLAGS=${LDFLAGS} +srcdir="$srcdir" +host="$host" +target="$target" +with_multisubdir="$with_multisubdir" +with_multisrctop="$with_multisrctop" +with_target_subdir="$with_target_subdir" +ac_configure_args="${multilib_arg} ${ac_configure_args}" +multi_basedir="$multi_basedir" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" _ACEOF @@ -5578,6 +5617,7 @@ do "nios2/Makefile") CONFIG_FILES="$CONFIG_FILES nios2/Makefile" ;; "libnosys/Makefile") CONFIG_FILES="$CONFIG_FILES libnosys/Makefile" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -6306,10 +6346,14 @@ $as_echo X"$file" | done } ;; - "Makefile":F) if test -n "$CONFIG_FILES"; then - unset ac_file - . ${srcdir}/../config-ml.in -fi ;; + "default-1":C) +# Only add multilib support code if we just rebuilt the top-level +# Makefile. +case " $CONFIG_FILES " in + *" Makefile "*) + ac_file=Makefile . ${multi_basedir}/config-ml.in + ;; +esac ;; esac done # for ac_tag @@ -6493,5 +6537,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - - diff --git a/libgloss/configure.ac b/libgloss/configure.ac index c65a365..ac812c6 100644 --- a/libgloss/configure.ac +++ b/libgloss/configure.ac @@ -330,27 +330,7 @@ target_makefile_frag_path=$target_makefile_frag AC_SUBST(target_makefile_frag_path) AC_SUBST_FILE(target_makefile_frag) -if test "${multilib}" = "yes"; then - multilib_arg="--enable-multilib" -else - multilib_arg= -fi +AM_ENABLE_MULTILIB(, ..) -# for now, only add multilibs for specific targets -AC_CONFIG_FILES([Makefile], -[if test -n "$CONFIG_FILES"; then - unset ac_file - . ${srcdir}/../config-ml.in -fi], -srcdir=${srcdir} -target=${target} -host=${host} -with_multisubdir=${with_multisubdir} -ac_configure_args="--enable-multilib ${ac_configure_args}" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -CC="${CC}" -LDFLAGS=${LDFLAGS} -) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT - - diff --git a/libgloss/csky/aclocal.m4 b/libgloss/csky/aclocal.m4 index 24271f3..fab8217 100644 --- a/libgloss/csky/aclocal.m4 +++ b/libgloss/csky/aclocal.m4 @@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) m4_include([../../config/depstand.m4]) m4_include([../../config/lead-dot.m4]) +m4_include([../../config/multi.m4]) m4_include([../../config/override.m4]) m4_include([../acinclude.m4]) diff --git a/libgloss/csky/configure b/libgloss/csky/configure index 672876a..98ca17f 100755 --- a/libgloss/csky/configure +++ b/libgloss/csky/configure @@ -584,6 +584,7 @@ PACKAGE_URL= ac_unique_file="crt0.S" ac_subst_vars='LTLIBOBJS LIBOBJS +multi_basedir target_makefile_frag_path host_makefile_frag_path DO @@ -670,6 +671,7 @@ target_makefile_frag' ac_user_opts=' enable_option_checking enable_dependency_tracking +enable_multilib ' ac_precious_vars='build_alias host_alias @@ -1303,6 +1305,7 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-multilib build many library versions (default) Some influential environment variables: CCAS assembler compiler command (defaults to CC) @@ -3577,6 +3580,44 @@ target_makefile_frag_path=$target_makefile_frag +# Default to --enable-multilib +# Check whether --enable-multilib was given. +if test "${enable_multilib+set}" = set; then : + enableval=$enable_multilib; case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;; + esac +else + multilib=yes +fi + + +# We may get other options which we leave undocumented: +# --with-target-subdir, --with-multisrctop, --with-multisubdir +# See config-ml.in if you want the gory details. + +if test "$srcdir" = "."; then + if test "$with_target_subdir" != "."; then + multi_basedir="$srcdir/$with_multisrctop../../.." + else + multi_basedir="$srcdir/$with_multisrctop../.." + fi +else + multi_basedir="$srcdir/../.." +fi + + +# Even if the default multilib is not a cross compilation, +# it may be that some of the other multilibs are. +if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe +fi + +ac_config_commands="$ac_config_commands default-1" + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -4293,12 +4334,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +srcdir="$srcdir" +host="$host" +target="$target" +with_multisubdir="$with_multisubdir" +with_multisrctop="$with_multisrctop" +with_target_subdir="$with_target_subdir" +ac_configure_args="${multilib_arg} ${ac_configure_args}" +multi_basedir="$multi_basedir" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" _ACEOF @@ -4309,6 +4358,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -4865,7 +4915,14 @@ $as_echo X"$file" | done } ;; - "Makefile":F) . ${srcdir}/../../config-ml.in ;; + "default-1":C) +# Only add multilib support code if we just rebuilt the top-level +# Makefile. +case " $CONFIG_FILES " in + *" Makefile "*) + ac_file=Makefile . ${multi_basedir}/config-ml.in + ;; +esac ;; esac done # for ac_tag @@ -4904,4 +4961,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - diff --git a/libgloss/csky/configure.ac b/libgloss/csky/configure.ac index 0387ea4..bb9a919 100644 --- a/libgloss/csky/configure.ac +++ b/libgloss/csky/configure.ac @@ -65,13 +65,7 @@ target_makefile_frag_path=$target_makefile_frag AC_SUBST(target_makefile_frag_path) AC_SUBST_FILE(target_makefile_frag) -AC_CONFIG_FILES(Makefile, -. ${srcdir}/../../config-ml.in, -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -) -AC_OUTPUT +AM_ENABLE_MULTILIB(, ../..) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/libgloss/i386/aclocal.m4 b/libgloss/i386/aclocal.m4 index 24271f3..fab8217 100644 --- a/libgloss/i386/aclocal.m4 +++ b/libgloss/i386/aclocal.m4 @@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) m4_include([../../config/depstand.m4]) m4_include([../../config/lead-dot.m4]) +m4_include([../../config/multi.m4]) m4_include([../../config/override.m4]) m4_include([../acinclude.m4]) diff --git a/libgloss/i386/configure b/libgloss/i386/configure index 81026b7..9f9e02b 100755 --- a/libgloss/i386/configure +++ b/libgloss/i386/configure @@ -584,6 +584,7 @@ PACKAGE_URL= ac_unique_file="cygmon-salib.c" ac_subst_vars='LTLIBOBJS LIBOBJS +multi_basedir host_makefile_frag_path CCASFLAGS CCAS @@ -663,6 +664,7 @@ ac_subst_files='host_makefile_frag' ac_user_opts=' enable_option_checking enable_dependency_tracking +enable_multilib ' ac_precious_vars='build_alias host_alias @@ -1290,6 +1292,7 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-multilib build many library versions (default) Some influential environment variables: CCAS assembler compiler command (defaults to CC) @@ -2555,6 +2558,44 @@ host_makefile_frag_path=$host_makefile_frag +# Default to --enable-multilib +# Check whether --enable-multilib was given. +if test "${enable_multilib+set}" = set; then : + enableval=$enable_multilib; case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;; + esac +else + multilib=yes +fi + + +# We may get other options which we leave undocumented: +# --with-target-subdir, --with-multisrctop, --with-multisubdir +# See config-ml.in if you want the gory details. + +if test "$srcdir" = "."; then + if test "$with_target_subdir" != "."; then + multi_basedir="$srcdir/$with_multisrctop../../.." + else + multi_basedir="$srcdir/$with_multisrctop../.." + fi +else + multi_basedir="$srcdir/../.." +fi + + +# Even if the default multilib is not a cross compilation, +# it may be that some of the other multilibs are. +if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe +fi + +ac_config_commands="$ac_config_commands default-1" + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -3271,12 +3312,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +srcdir="$srcdir" +host="$host" +target="$target" +with_multisubdir="$with_multisubdir" +with_multisrctop="$with_multisrctop" +with_target_subdir="$with_target_subdir" +ac_configure_args="${multilib_arg} ${ac_configure_args}" +multi_basedir="$multi_basedir" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" _ACEOF @@ -3287,6 +3336,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -3843,7 +3893,14 @@ $as_echo X"$file" | done } ;; - "Makefile":F) . ${srcdir}/../../config-ml.in ;; + "default-1":C) +# Only add multilib support code if we just rebuilt the top-level +# Makefile. +case " $CONFIG_FILES " in + *" Makefile "*) + ac_file=Makefile . ${multi_basedir}/config-ml.in + ;; +esac ;; esac done # for ac_tag diff --git a/libgloss/i386/configure.ac b/libgloss/i386/configure.ac index 895e447..e036207 100644 --- a/libgloss/i386/configure.ac +++ b/libgloss/i386/configure.ac @@ -53,12 +53,7 @@ host_makefile_frag_path=$host_makefile_frag AC_SUBST(host_makefile_frag_path) AC_SUBST_FILE(host_makefile_frag) -AC_CONFIG_FILES(Makefile, -. ${srcdir}/../../config-ml.in, -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -) +AM_ENABLE_MULTILIB(, ../..) + +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/libgloss/m68k/aclocal.m4 b/libgloss/m68k/aclocal.m4 index 24271f3..fab8217 100644 --- a/libgloss/m68k/aclocal.m4 +++ b/libgloss/m68k/aclocal.m4 @@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) m4_include([../../config/depstand.m4]) m4_include([../../config/lead-dot.m4]) +m4_include([../../config/multi.m4]) m4_include([../../config/override.m4]) m4_include([../acinclude.m4]) diff --git a/libgloss/m68k/configure b/libgloss/m68k/configure index 2b3e568..2a9d3f2 100755 --- a/libgloss/m68k/configure +++ b/libgloss/m68k/configure @@ -584,6 +584,7 @@ PACKAGE_URL= ac_unique_file="crt0.S" ac_subst_vars='LTLIBOBJS LIBOBJS +multi_basedir target_makefile_frag_path host_makefile_frag_path DO @@ -670,6 +671,7 @@ target_makefile_frag' ac_user_opts=' enable_option_checking enable_dependency_tracking +enable_multilib ' ac_precious_vars='build_alias host_alias @@ -1303,6 +1305,7 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-multilib build many library versions (default) Some influential environment variables: CCAS assembler compiler command (defaults to CC) @@ -3577,6 +3580,44 @@ target_makefile_frag_path=$target_makefile_frag +# Default to --enable-multilib +# Check whether --enable-multilib was given. +if test "${enable_multilib+set}" = set; then : + enableval=$enable_multilib; case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;; + esac +else + multilib=yes +fi + + +# We may get other options which we leave undocumented: +# --with-target-subdir, --with-multisrctop, --with-multisubdir +# See config-ml.in if you want the gory details. + +if test "$srcdir" = "."; then + if test "$with_target_subdir" != "."; then + multi_basedir="$srcdir/$with_multisrctop../../.." + else + multi_basedir="$srcdir/$with_multisrctop../.." + fi +else + multi_basedir="$srcdir/../.." +fi + + +# Even if the default multilib is not a cross compilation, +# it may be that some of the other multilibs are. +if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe +fi + +ac_config_commands="$ac_config_commands default-1" + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -4293,12 +4334,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +srcdir="$srcdir" +host="$host" +target="$target" +with_multisubdir="$with_multisubdir" +with_multisrctop="$with_multisrctop" +with_target_subdir="$with_target_subdir" +ac_configure_args="${multilib_arg} ${ac_configure_args}" +multi_basedir="$multi_basedir" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" _ACEOF @@ -4309,6 +4358,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -4865,7 +4915,14 @@ $as_echo X"$file" | done } ;; - "Makefile":F) . ${srcdir}/../../config-ml.in ;; + "default-1":C) +# Only add multilib support code if we just rebuilt the top-level +# Makefile. +case " $CONFIG_FILES " in + *" Makefile "*) + ac_file=Makefile . ${multi_basedir}/config-ml.in + ;; +esac ;; esac done # for ac_tag @@ -4904,4 +4961,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - diff --git a/libgloss/m68k/configure.ac b/libgloss/m68k/configure.ac index 53615ff..de35d79 100644 --- a/libgloss/m68k/configure.ac +++ b/libgloss/m68k/configure.ac @@ -65,13 +65,7 @@ target_makefile_frag_path=$target_makefile_frag AC_SUBST(target_makefile_frag_path) AC_SUBST_FILE(target_makefile_frag) -AC_CONFIG_FILES(Makefile, -. ${srcdir}/../../config-ml.in, -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -) -AC_OUTPUT +AM_ENABLE_MULTILIB(, ../..) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/libgloss/mcore/aclocal.m4 b/libgloss/mcore/aclocal.m4 index 24271f3..fab8217 100644 --- a/libgloss/mcore/aclocal.m4 +++ b/libgloss/mcore/aclocal.m4 @@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) m4_include([../../config/depstand.m4]) m4_include([../../config/lead-dot.m4]) +m4_include([../../config/multi.m4]) m4_include([../../config/override.m4]) m4_include([../acinclude.m4]) diff --git a/libgloss/mcore/configure b/libgloss/mcore/configure index 62f9f69..840f4a9 100755 --- a/libgloss/mcore/configure +++ b/libgloss/mcore/configure @@ -584,6 +584,7 @@ PACKAGE_URL= ac_unique_file="crt0.S" ac_subst_vars='LTLIBOBJS LIBOBJS +multi_basedir host_makefile_frag_path bsp_prefix CCASFLAGS @@ -661,6 +662,7 @@ ac_subst_files='host_makefile_frag' ac_user_opts=' enable_option_checking enable_dependency_tracking +enable_multilib ' ac_precious_vars='build_alias host_alias @@ -1288,6 +1290,7 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-multilib build many library versions (default) Some influential environment variables: CCAS assembler compiler command (defaults to CC) @@ -2552,6 +2555,44 @@ host_makefile_frag_path=$host_makefile_frag +# Default to --enable-multilib +# Check whether --enable-multilib was given. +if test "${enable_multilib+set}" = set; then : + enableval=$enable_multilib; case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;; + esac +else + multilib=yes +fi + + +# We may get other options which we leave undocumented: +# --with-target-subdir, --with-multisrctop, --with-multisubdir +# See config-ml.in if you want the gory details. + +if test "$srcdir" = "."; then + if test "$with_target_subdir" != "."; then + multi_basedir="$srcdir/$with_multisrctop../../.." + else + multi_basedir="$srcdir/$with_multisrctop../.." + fi +else + multi_basedir="$srcdir/../.." +fi + + +# Even if the default multilib is not a cross compilation, +# it may be that some of the other multilibs are. +if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe +fi + +ac_config_commands="$ac_config_commands default-1" + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -3268,12 +3309,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +srcdir="$srcdir" +host="$host" +target="$target" +with_multisubdir="$with_multisubdir" +with_multisrctop="$with_multisrctop" +with_target_subdir="$with_target_subdir" +ac_configure_args="${multilib_arg} ${ac_configure_args}" +multi_basedir="$multi_basedir" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" _ACEOF @@ -3284,6 +3333,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -3840,7 +3890,14 @@ $as_echo X"$file" | done } ;; - "Makefile":F) . ${srcdir}/../../config-ml.in ;; + "default-1":C) +# Only add multilib support code if we just rebuilt the top-level +# Makefile. +case " $CONFIG_FILES " in + *" Makefile "*) + ac_file=Makefile . ${multi_basedir}/config-ml.in + ;; +esac ;; esac done # for ac_tag diff --git a/libgloss/mcore/configure.ac b/libgloss/mcore/configure.ac index a314d4e..f6b3f00 100644 --- a/libgloss/mcore/configure.ac +++ b/libgloss/mcore/configure.ac @@ -39,12 +39,7 @@ host_makefile_frag_path=$host_makefile_frag AC_SUBST(host_makefile_frag_path) AC_SUBST_FILE(host_makefile_frag) -AC_CONFIG_FILES(Makefile, -. ${srcdir}/../../config-ml.in, -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -) +AM_ENABLE_MULTILIB(, ../..) + +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/libgloss/mips/aclocal.m4 b/libgloss/mips/aclocal.m4 index 24271f3..fab8217 100644 --- a/libgloss/mips/aclocal.m4 +++ b/libgloss/mips/aclocal.m4 @@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) m4_include([../../config/depstand.m4]) m4_include([../../config/lead-dot.m4]) +m4_include([../../config/multi.m4]) m4_include([../../config/override.m4]) m4_include([../acinclude.m4]) diff --git a/libgloss/mips/configure b/libgloss/mips/configure index 2026f0a..8b035f4 100755 --- a/libgloss/mips/configure +++ b/libgloss/mips/configure @@ -584,6 +584,7 @@ PACKAGE_URL= ac_unique_file="crt0.S" ac_subst_vars='LTLIBOBJS LIBOBJS +multi_basedir pcrt0 crt0 bsp_list @@ -668,6 +669,7 @@ target_makefile_frag' ac_user_opts=' enable_option_checking enable_dependency_tracking +enable_multilib ' ac_precious_vars='build_alias host_alias @@ -1295,6 +1297,7 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-multilib build many library versions (default) Some influential environment variables: CCAS assembler compiler command (defaults to CC) @@ -2604,6 +2607,44 @@ target_makefile_frag_path=$target_makefile_frag +# Default to --enable-multilib +# Check whether --enable-multilib was given. +if test "${enable_multilib+set}" = set; then : + enableval=$enable_multilib; case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;; + esac +else + multilib=yes +fi + + +# We may get other options which we leave undocumented: +# --with-target-subdir, --with-multisrctop, --with-multisubdir +# See config-ml.in if you want the gory details. + +if test "$srcdir" = "."; then + if test "$with_target_subdir" != "."; then + multi_basedir="$srcdir/$with_multisrctop../../.." + else + multi_basedir="$srcdir/$with_multisrctop../.." + fi +else + multi_basedir="$srcdir/../.." +fi + + +# Even if the default multilib is not a cross compilation, +# it may be that some of the other multilibs are. +if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe +fi + +ac_config_commands="$ac_config_commands default-1" + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -3320,12 +3361,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +srcdir="$srcdir" +host="$host" +target="$target" +with_multisubdir="$with_multisubdir" +with_multisrctop="$with_multisrctop" +with_target_subdir="$with_target_subdir" +ac_configure_args="${multilib_arg} ${ac_configure_args}" +multi_basedir="$multi_basedir" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" _ACEOF @@ -3336,6 +3385,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -3892,7 +3942,14 @@ $as_echo X"$file" | done } ;; - "Makefile":F) . ${srcdir}/../../config-ml.in ;; + "default-1":C) +# Only add multilib support code if we just rebuilt the top-level +# Makefile. +case " $CONFIG_FILES " in + *" Makefile "*) + ac_file=Makefile . ${multi_basedir}/config-ml.in + ;; +esac ;; esac done # for ac_tag diff --git a/libgloss/mips/configure.ac b/libgloss/mips/configure.ac index a609233..ca99c72 100644 --- a/libgloss/mips/configure.ac +++ b/libgloss/mips/configure.ac @@ -97,12 +97,7 @@ AC_SUBST(bsp_list) AC_SUBST(crt0) AC_SUBST(pcrt0) -AC_CONFIG_FILES(Makefile, -. ${srcdir}/../../config-ml.in, -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -) +AM_ENABLE_MULTILIB(, ../..) + +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/libgloss/mn10200/aclocal.m4 b/libgloss/mn10200/aclocal.m4 index 24271f3..fab8217 100644 --- a/libgloss/mn10200/aclocal.m4 +++ b/libgloss/mn10200/aclocal.m4 @@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) m4_include([../../config/depstand.m4]) m4_include([../../config/lead-dot.m4]) +m4_include([../../config/multi.m4]) m4_include([../../config/override.m4]) m4_include([../acinclude.m4]) diff --git a/libgloss/mn10200/configure b/libgloss/mn10200/configure index 728c774..401064f 100755 --- a/libgloss/mn10200/configure +++ b/libgloss/mn10200/configure @@ -584,6 +584,7 @@ PACKAGE_URL= ac_unique_file="crt0.S" ac_subst_vars='LTLIBOBJS LIBOBJS +multi_basedir part_specific_obj target_makefile_frag_path host_makefile_frag_path @@ -663,6 +664,7 @@ target_makefile_frag' ac_user_opts=' enable_option_checking enable_dependency_tracking +enable_multilib ' ac_precious_vars='build_alias host_alias @@ -1290,6 +1292,7 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-multilib build many library versions (default) Some influential environment variables: CCAS assembler compiler command (defaults to CC) @@ -2554,6 +2557,44 @@ target_makefile_frag_path=$target_makefile_frag +# Default to --enable-multilib +# Check whether --enable-multilib was given. +if test "${enable_multilib+set}" = set; then : + enableval=$enable_multilib; case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;; + esac +else + multilib=yes +fi + + +# We may get other options which we leave undocumented: +# --with-target-subdir, --with-multisrctop, --with-multisubdir +# See config-ml.in if you want the gory details. + +if test "$srcdir" = "."; then + if test "$with_target_subdir" != "."; then + multi_basedir="$srcdir/$with_multisrctop../../.." + else + multi_basedir="$srcdir/$with_multisrctop../.." + fi +else + multi_basedir="$srcdir/../.." +fi + + +# Even if the default multilib is not a cross compilation, +# it may be that some of the other multilibs are. +if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe +fi + +ac_config_commands="$ac_config_commands default-1" + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -3270,12 +3311,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +srcdir="$srcdir" +host="$host" +target="$target" +with_multisubdir="$with_multisubdir" +with_multisrctop="$with_multisrctop" +with_target_subdir="$with_target_subdir" +ac_configure_args="${multilib_arg} ${ac_configure_args}" +multi_basedir="$multi_basedir" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" _ACEOF @@ -3286,6 +3335,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -3842,7 +3892,14 @@ $as_echo X"$file" | done } ;; - "Makefile":F) . ${srcdir}/../../config-ml.in ;; + "default-1":C) +# Only add multilib support code if we just rebuilt the top-level +# Makefile. +case " $CONFIG_FILES " in + *" Makefile "*) + ac_file=Makefile . ${multi_basedir}/config-ml.in + ;; +esac ;; esac done # for ac_tag @@ -3881,5 +3938,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - - diff --git a/libgloss/mn10200/configure.ac b/libgloss/mn10200/configure.ac index 70dbd49..d5a0cc8 100644 --- a/libgloss/mn10200/configure.ac +++ b/libgloss/mn10200/configure.ac @@ -52,14 +52,7 @@ AC_SUBST(target_makefile_frag_path) AC_SUBST_FILE(target_makefile_frag) AC_SUBST(part_specific_obj) -AC_CONFIG_FILES(Makefile, -. ${srcdir}/../../config-ml.in, -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -) -AC_OUTPUT - +AM_ENABLE_MULTILIB(, ../..) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/libgloss/mn10300/aclocal.m4 b/libgloss/mn10300/aclocal.m4 index 24271f3..fab8217 100644 --- a/libgloss/mn10300/aclocal.m4 +++ b/libgloss/mn10300/aclocal.m4 @@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) m4_include([../../config/depstand.m4]) m4_include([../../config/lead-dot.m4]) +m4_include([../../config/multi.m4]) m4_include([../../config/override.m4]) m4_include([../acinclude.m4]) diff --git a/libgloss/mn10300/configure b/libgloss/mn10300/configure index 9718855..4ddb539 100755 --- a/libgloss/mn10300/configure +++ b/libgloss/mn10300/configure @@ -584,6 +584,7 @@ PACKAGE_URL= ac_unique_file="crt0.S" ac_subst_vars='LTLIBOBJS LIBOBJS +multi_basedir bsp_list script_list part_specific_obj @@ -665,6 +666,7 @@ target_makefile_frag' ac_user_opts=' enable_option_checking enable_dependency_tracking +enable_multilib ' ac_precious_vars='build_alias host_alias @@ -1292,6 +1294,7 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-multilib build many library versions (default) Some influential environment variables: CCAS assembler compiler command (defaults to CC) @@ -2565,6 +2568,44 @@ target_makefile_frag_path=$target_makefile_frag +# Default to --enable-multilib +# Check whether --enable-multilib was given. +if test "${enable_multilib+set}" = set; then : + enableval=$enable_multilib; case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;; + esac +else + multilib=yes +fi + + +# We may get other options which we leave undocumented: +# --with-target-subdir, --with-multisrctop, --with-multisubdir +# See config-ml.in if you want the gory details. + +if test "$srcdir" = "."; then + if test "$with_target_subdir" != "."; then + multi_basedir="$srcdir/$with_multisrctop../../.." + else + multi_basedir="$srcdir/$with_multisrctop../.." + fi +else + multi_basedir="$srcdir/../.." +fi + + +# Even if the default multilib is not a cross compilation, +# it may be that some of the other multilibs are. +if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe +fi + +ac_config_commands="$ac_config_commands default-1" + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -3281,12 +3322,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +srcdir="$srcdir" +host="$host" +target="$target" +with_multisubdir="$with_multisubdir" +with_multisrctop="$with_multisrctop" +with_target_subdir="$with_target_subdir" +ac_configure_args="${multilib_arg} ${ac_configure_args}" +multi_basedir="$multi_basedir" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" _ACEOF @@ -3297,6 +3346,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -3853,10 +3903,14 @@ $as_echo X"$file" | done } ;; - "Makefile":F) if test -n "$CONFIG_FILES"; then - unset ac_file - . ${srcdir}/../../config-ml.in -fi ;; + "default-1":C) +# Only add multilib support code if we just rebuilt the top-level +# Makefile. +case " $CONFIG_FILES " in + *" Makefile "*) + ac_file=Makefile . ${multi_basedir}/config-ml.in + ;; +esac ;; esac done # for ac_tag @@ -3895,5 +3949,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - - diff --git a/libgloss/mn10300/configure.ac b/libgloss/mn10300/configure.ac index 9526576..88af0f9 100644 --- a/libgloss/mn10300/configure.ac +++ b/libgloss/mn10300/configure.ac @@ -61,17 +61,7 @@ AC_SUBST(part_specific_obj) AC_SUBST(script_list) AC_SUBST(bsp_list) -AC_CONFIG_FILES([Makefile], -[if test -n "$CONFIG_FILES"; then - unset ac_file - . ${srcdir}/../../config-ml.in -fi], -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -) -AC_OUTPUT - +AM_ENABLE_MULTILIB(, ../..) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/libgloss/moxie/aclocal.m4 b/libgloss/moxie/aclocal.m4 index 24271f3..fab8217 100644 --- a/libgloss/moxie/aclocal.m4 +++ b/libgloss/moxie/aclocal.m4 @@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) m4_include([../../config/depstand.m4]) m4_include([../../config/lead-dot.m4]) +m4_include([../../config/multi.m4]) m4_include([../../config/override.m4]) m4_include([../acinclude.m4]) diff --git a/libgloss/moxie/configure b/libgloss/moxie/configure index db77f07..5ce3f34 100755 --- a/libgloss/moxie/configure +++ b/libgloss/moxie/configure @@ -584,6 +584,7 @@ PACKAGE_URL= ac_unique_file="crt0.S" ac_subst_vars='LTLIBOBJS LIBOBJS +multi_basedir host_makefile_frag_path BUILD_CRT0_FALSE BUILD_CRT0_TRUE @@ -662,6 +663,7 @@ ac_subst_files='host_makefile_frag' ac_user_opts=' enable_option_checking enable_dependency_tracking +enable_multilib ' ac_precious_vars='build_alias host_alias @@ -1289,6 +1291,7 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-multilib build many library versions (default) Some influential environment variables: CCAS assembler compiler command (defaults to CC) @@ -2557,6 +2560,44 @@ host_makefile_frag_path=$host_makefile_frag +# Default to --enable-multilib +# Check whether --enable-multilib was given. +if test "${enable_multilib+set}" = set; then : + enableval=$enable_multilib; case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;; + esac +else + multilib=yes +fi + + +# We may get other options which we leave undocumented: +# --with-target-subdir, --with-multisrctop, --with-multisubdir +# See config-ml.in if you want the gory details. + +if test "$srcdir" = "."; then + if test "$with_target_subdir" != "."; then + multi_basedir="$srcdir/$with_multisrctop../../.." + else + multi_basedir="$srcdir/$with_multisrctop../.." + fi +else + multi_basedir="$srcdir/../.." +fi + + +# Even if the default multilib is not a cross compilation, +# it may be that some of the other multilibs are. +if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe +fi + +ac_config_commands="$ac_config_commands default-1" + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -3273,12 +3314,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +srcdir="$srcdir" +host="$host" +target="$target" +with_multisubdir="$with_multisubdir" +with_multisrctop="$with_multisrctop" +with_target_subdir="$with_target_subdir" +ac_configure_args="${multilib_arg} ${ac_configure_args}" +multi_basedir="$multi_basedir" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" _ACEOF @@ -3289,6 +3338,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -3845,7 +3895,14 @@ $as_echo X"$file" | done } ;; - "Makefile":F) . ${srcdir}/../../config-ml.in ;; + "default-1":C) +# Only add multilib support code if we just rebuilt the top-level +# Makefile. +case " $CONFIG_FILES " in + *" Makefile "*) + ac_file=Makefile . ${multi_basedir}/config-ml.in + ;; +esac ;; esac done # for ac_tag diff --git a/libgloss/moxie/configure.ac b/libgloss/moxie/configure.ac index baf66ef..f09d72b 100644 --- a/libgloss/moxie/configure.ac +++ b/libgloss/moxie/configure.ac @@ -44,12 +44,7 @@ host_makefile_frag_path=$host_makefile_frag AC_SUBST(host_makefile_frag_path) AC_SUBST_FILE(host_makefile_frag) -AC_CONFIG_FILES(Makefile, -. ${srcdir}/../../config-ml.in, -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -) +AM_ENABLE_MULTILIB(, ../..) + +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/libgloss/sparc/aclocal.m4 b/libgloss/sparc/aclocal.m4 index 24271f3..fab8217 100644 --- a/libgloss/sparc/aclocal.m4 +++ b/libgloss/sparc/aclocal.m4 @@ -379,5 +379,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) m4_include([../../config/depstand.m4]) m4_include([../../config/lead-dot.m4]) +m4_include([../../config/multi.m4]) m4_include([../../config/override.m4]) m4_include([../acinclude.m4]) diff --git a/libgloss/sparc/configure b/libgloss/sparc/configure index d4da116..1a1e6a0 100755 --- a/libgloss/sparc/configure +++ b/libgloss/sparc/configure @@ -585,6 +585,7 @@ ac_unique_file="sparc-stub.c" enable_option_checking=no ac_subst_vars='LTLIBOBJS LIBOBJS +multi_basedir CYGMONLDSCRIPTTEMPL target_makefile_frag_path host_makefile_frag_path @@ -666,6 +667,7 @@ target_makefile_frag' ac_user_opts=' enable_option_checking enable_dependency_tracking +enable_multilib ' ac_precious_vars='build_alias host_alias @@ -1288,6 +1290,7 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --enable-multilib build many library versions (default) Some influential environment variables: CCAS assembler compiler command (defaults to CC) @@ -2554,9 +2557,45 @@ target_makefile_frag_path=$target_makefile_frag -ac_config_files="$ac_config_files Makefile" +# Default to --enable-multilib +# Check whether --enable-multilib was given. +if test "${enable_multilib+set}" = set; then : + enableval=$enable_multilib; case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;; + esac +else + multilib=yes +fi + + +# We may get other options which we leave undocumented: +# --with-target-subdir, --with-multisrctop, --with-multisubdir +# See config-ml.in if you want the gory details. + +if test "$srcdir" = "."; then + if test "$with_target_subdir" != "."; then + multi_basedir="$srcdir/$with_multisrctop../../.." + else + multi_basedir="$srcdir/$with_multisrctop../.." + fi +else + multi_basedir="$srcdir/../.." +fi -ac_config_commands="$ac_config_commands default" + +# Even if the default multilib is not a cross compilation, +# it may be that some of the other multilibs are. +if test $cross_compiling = no && test $multilib = yes \ + && test "x${with_multisubdir}" != x ; then + cross_compiling=maybe +fi + +ac_config_commands="$ac_config_commands default-1" + + +ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3272,12 +3311,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +srcdir="$srcdir" +host="$host" +target="$target" +with_multisubdir="$with_multisubdir" +with_multisrctop="$with_multisrctop" +with_target_subdir="$with_target_subdir" +ac_configure_args="${multilib_arg} ${ac_configure_args}" +multi_basedir="$multi_basedir" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" _ACEOF @@ -3288,8 +3335,8 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -3845,7 +3892,14 @@ $as_echo X"$file" | done } ;; - "default":C) . ${srcdir}/../../config-ml.in ;; + "default-1":C) +# Only add multilib support code if we just rebuilt the top-level +# Makefile. +case " $CONFIG_FILES " in + *" Makefile "*) + ac_file=Makefile . ${multi_basedir}/config-ml.in + ;; +esac ;; esac done # for ac_tag @@ -4029,4 +4083,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - diff --git a/libgloss/sparc/configure.ac b/libgloss/sparc/configure.ac index 9a9b987..56049d5 100644 --- a/libgloss/sparc/configure.ac +++ b/libgloss/sparc/configure.ac @@ -58,12 +58,7 @@ AC_SUBST(target_makefile_frag_path) AC_SUBST_FILE(target_makefile_frag) AC_SUBST(CYGMONLDSCRIPTTEMPL) -AC_OUTPUT(Makefile, -. ${srcdir}/../../config-ml.in, -srcdir=${srcdir} -target=${target} -with_multisubdir=${with_multisubdir} -ac_configure_args="${ac_configure_args} --enable-multilib" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -) +AM_ENABLE_MULTILIB(, ../..) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT |