From 5b043f084508752b8c5ae7659e01d6486455c166 Mon Sep 17 00:00:00 2001 From: Geoffrey Keating Date: Sun, 15 Oct 2006 07:42:57 +0000 Subject: Index: config/ChangeLog 2006-10-14 Geoffrey Keating * multi.m4: New file, from automake version 2 branch. Index: libgomp/ChangeLog 2006-10-14 Geoffrey Keating * aclocal.m4: Regenerate. * configure: Regenerate. Index: libstdc++-v3/ChangeLog 2006-10-14 Geoffrey Keating * aclocal.m4: Regenerate. * configure: Regenerate with released autoconf-2.59. Index: libobjc/ChangeLog 2006-10-14 Geoffrey Keating * Makefile.in: Use multi_basedir instead of toplevel_srcdir. * configure.ac: Use multi.m4 from aclocal rather than custom code. Use multi_basedir instead of toplevel_srcdir. * aclocal.m4: Regenerate. * configure: Regenerate. Index: libssp/ChangeLog 2006-10-14 Geoffrey Keating * aclocal.m4: Regenerate. * configure: Regenerate. From-SVN: r117741 --- libobjc/configure | 120 +++++++++++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) (limited to 'libobjc/configure') diff --git a/libobjc/configure b/libobjc/configure index 85b30dbb4bf..59d55653716 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir VERSION OBJC_BOEHM_GC OBJC_BOEHM_GC_INCLUDES toplevel_srcdir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir toolexecdir toolexeclibdir includedirname libext CC ac_ct_CC EXEEXT OBJEXT extra_ldflags_libobjc CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP CPPFLAGS EGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir VERSION OBJC_BOEHM_GC OBJC_BOEHM_GC_INCLUDES multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir toolexecdir toolexeclibdir includedirname libext CC ac_ct_CC EXEEXT OBJEXT extra_ldflags_libobjc CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP CPPFLAGS EGREP LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -835,10 +835,10 @@ if test -n "$ac_init_help"; then Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-multilib build hella library versions (default) --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory --enable-objc-gc enable the use of Boehm's garbage collector with the GNU Objective-C runtime. + --enable-multilib build many library versions (default) --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer --enable-shared=PKGS build shared libraries default=yes @@ -1435,21 +1435,6 @@ ORIGINAL_LD_FOR_MULTILIBS=$LD # Options # ------- -# Default to --enable-multilib -# Check whether --enable-multilib or --disable-multilib was given. -if test "${enable_multilib+set}" = set; then - enableval="$enable_multilib" - case "${enableval}" in - yes) multilib=yes ;; - no) multilib=no ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for multilib option" >&5 -echo "$as_me: error: bad value ${enableval} for multilib option" >&2;} - { (exit 1); exit 1; }; } ;; - esac -else - multilib=yes -fi; - # We use these options to decide which functions to include. # Check whether --with-target-subdir or --without-target-subdir was given. @@ -1505,50 +1490,45 @@ fi; # Directories # ----------- -# When building with srcdir == objdir, links to the source files will -# be created in directories within the target_subdir. We have to -# adjust toplevel_srcdir accordingly, so that configure finds -# install-sh and other auxiliary files that live in the top-level -# source directory. -if test "${srcdir}" = "."; then - if test -z "${with_target_subdir}"; then - toprel=".." +# Find the rest of the source tree framework. +# Default to --enable-multilib +# Check whether --enable-multilib or --disable-multilib was given. +if test "${enable_multilib+set}" = set; then + enableval="$enable_multilib" + case "$enableval" in + yes) multilib=yes ;; + no) multilib=no ;; + *) { { echo "$as_me:$LINENO: error: bad value $enableval for multilib option" >&5 +echo "$as_me: error: bad value $enableval for multilib option" >&2;} + { (exit 1); exit 1; }; } ;; + 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 - if test "${with_target_subdir}" != "."; then - toprel="${with_multisrctop}../.." - else - toprel="${with_multisrctop}.." - fi + multi_basedir="$srcdir/$with_multisrctop.." fi else - toprel=".." + multi_basedir="$srcdir/.." fi -ac_aux_dir= -for ac_dir in ${srcdir}/$toprel $srcdir/${srcdir}/$toprel; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f $ac_dir/shtool; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ${srcdir}/$toprel $srcdir/${srcdir}/$toprel" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in ${srcdir}/$toprel $srcdir/${srcdir}/$toprel" >&2;} - { (exit 1); exit 1; }; } + + +# 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_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -toplevel_srcdir=\${srcdir}/$toprel + ac_config_commands="$ac_config_commands default-1" echo "$as_me:$LINENO: checking host system type" >&5 @@ -3791,7 +3771,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3794 "configure"' > conftest.$ac_ext + echo '#line 3774 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5219,7 +5199,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : else cat > conftest.$ac_ext << EOF -#line 5222 "configure" +#line 5202 "configure" @interface Frob @end @implementation Frob @@ -5815,13 +5795,24 @@ cat >>$CONFIG_STATUS <<_ACEOF # INIT-COMMANDS section. # + +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" srcdir=${srcdir} host=${host} target=${target} with_target_subdir=${with_target_subdir} with_multisubdir=${with_multisubdir} ac_configure_args="--enable-multilib ${ac_configure_args}" -toplevel_srcdir=${toplevel_srcdir} +multi_basedir=${multi_basedir} CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" @@ -5836,6 +5827,7 @@ do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -5934,7 +5926,7 @@ s,@target_subdir@,$target_subdir,;t t s,@VERSION@,$VERSION,;t t s,@OBJC_BOEHM_GC@,$OBJC_BOEHM_GC,;t t s,@OBJC_BOEHM_GC_INCLUDES@,$OBJC_BOEHM_GC_INCLUDES,;t t -s,@toplevel_srcdir@,$toplevel_srcdir,;t t +s,@multi_basedir@,$multi_basedir,;t t s,@host@,$host,;t t s,@host_cpu@,$host_cpu,;t t s,@host_vendor@,$host_vendor,;t t @@ -6552,12 +6544,20 @@ esac { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in + default-1 ) +# 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 ;; default ) if test -n "$CONFIG_FILES"; then if test -n "${with_target_subdir}"; then # FIXME: We shouldn't need to set ac_file ac_file=Makefile LD="${ORIGINAL_LD_FOR_MULTILIBS}" - . ${toplevel_srcdir}/config-ml.in + . ${multi_basedir}/config-ml.in fi fi ;; esac -- cgit v1.2.1