diff options
Diffstat (limited to 'libobjc/configure.ac')
| -rw-r--r-- | libobjc/configure.ac | 37 |
1 files changed, 4 insertions, 33 deletions
diff --git a/libobjc/configure.ac b/libobjc/configure.ac index bc3eb2da070..fca4418bb5d 100644 --- a/libobjc/configure.ac +++ b/libobjc/configure.ac @@ -41,16 +41,6 @@ ORIGINAL_LD_FOR_MULTILIBS=$LD # Options # ------- -# Default to --enable-multilib -AC_ARG_ENABLE(multilib, - [ --enable-multilib build hella library versions (default)], - [case "${enableval}" in - yes) multilib=yes ;; - no) multilib=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; - esac], - [multilib=yes]) - # We use these options to decide which functions to include. AC_ARG_WITH(target-subdir, [ --with-target-subdir=SUBDIR @@ -90,27 +80,8 @@ AC_SUBST(OBJC_BOEHM_GC_INCLUDES) # 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=".." - else - if test "${with_target_subdir}" != "."; then - toprel="${with_multisrctop}../.." - else - toprel="${with_multisrctop}.." - fi - fi -else - toprel=".." -fi -AC_CONFIG_AUX_DIR(${srcdir}/$toprel) -toplevel_srcdir=\${srcdir}/$toprel -AC_SUBST(toplevel_srcdir) +# Find the rest of the source tree framework. +AM_ENABLE_MULTILIB(, ..) AC_CANONICAL_SYSTEM ACX_NONCANONICAL_TARGET @@ -308,7 +279,7 @@ AC_CONFIG_COMMANDS([default], # 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]], [[srcdir=${srcdir} @@ -317,7 +288,7 @@ 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}" ]]) |