configure.ac: Move AM_ENABLE_MULTILIB before AC_PROG_CC.
2015-01-24 Matthias Klose <doko@ubuntu.com> * configure.ac: Move AM_ENABLE_MULTILIB before AC_PROG_CC. * configure: Regenerate. From-SVN: r220113
This commit is contained in:
parent
2b8fa469eb
commit
ee5f05239f
|
@ -1,3 +1,8 @@
|
||||||
|
2015-01-26 Matthias Klose <doko@ubuntu.com>
|
||||||
|
|
||||||
|
* configure.ac: Move AM_ENABLE_MULTILIB before AC_PROG_CC.
|
||||||
|
* configure: Regenerate.
|
||||||
|
|
||||||
2015-01-05 Jakub Jelinek <jakub@redhat.com>
|
2015-01-05 Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
||||||
* libquadmath.texi: Bump @copying's copyright year.
|
* libquadmath.texi: Bump @copying's copyright year.
|
||||||
|
|
|
@ -613,7 +613,6 @@ LIBQUAD_USE_SYMVER_FALSE
|
||||||
LIBQUAD_USE_SYMVER_TRUE
|
LIBQUAD_USE_SYMVER_TRUE
|
||||||
toolexeclibdir
|
toolexeclibdir
|
||||||
toolexecdir
|
toolexecdir
|
||||||
multi_basedir
|
|
||||||
MAINT
|
MAINT
|
||||||
MAINTAINER_MODE_FALSE
|
MAINTAINER_MODE_FALSE
|
||||||
MAINTAINER_MODE_TRUE
|
MAINTAINER_MODE_TRUE
|
||||||
|
@ -682,6 +681,7 @@ am__isrc
|
||||||
INSTALL_DATA
|
INSTALL_DATA
|
||||||
INSTALL_SCRIPT
|
INSTALL_SCRIPT
|
||||||
INSTALL_PROGRAM
|
INSTALL_PROGRAM
|
||||||
|
multi_basedir
|
||||||
target_noncanonical
|
target_noncanonical
|
||||||
target_os
|
target_os
|
||||||
target_vendor
|
target_vendor
|
||||||
|
@ -736,6 +736,7 @@ SHELL'
|
||||||
ac_subst_files=''
|
ac_subst_files=''
|
||||||
ac_user_opts='
|
ac_user_opts='
|
||||||
enable_option_checking
|
enable_option_checking
|
||||||
|
enable_multilib
|
||||||
enable_version_specific_runtime_libs
|
enable_version_specific_runtime_libs
|
||||||
enable_dependency_tracking
|
enable_dependency_tracking
|
||||||
with_bugurl
|
with_bugurl
|
||||||
|
@ -746,7 +747,6 @@ enable_fast_install
|
||||||
with_gnu_ld
|
with_gnu_ld
|
||||||
enable_libtool_lock
|
enable_libtool_lock
|
||||||
enable_maintainer_mode
|
enable_maintainer_mode
|
||||||
enable_multilib
|
|
||||||
enable_symvers
|
enable_symvers
|
||||||
enable_generated_files_in_srcdir
|
enable_generated_files_in_srcdir
|
||||||
'
|
'
|
||||||
|
@ -1379,6 +1379,7 @@ Optional Features:
|
||||||
--disable-option-checking ignore unrecognized --enable/--with options
|
--disable-option-checking ignore unrecognized --enable/--with options
|
||||||
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
||||||
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
||||||
|
--enable-multilib build many library versions (default)
|
||||||
--enable-version-specific-runtime-libs
|
--enable-version-specific-runtime-libs
|
||||||
specify that runtime libraries should be installed
|
specify that runtime libraries should be installed
|
||||||
in a compiler-specific directory
|
in a compiler-specific directory
|
||||||
|
@ -1391,7 +1392,6 @@ Optional Features:
|
||||||
--disable-libtool-lock avoid locking (might break parallel builds)
|
--disable-libtool-lock avoid locking (might break parallel builds)
|
||||||
--enable-maintainer-mode enable make rules and dependencies not useful
|
--enable-maintainer-mode enable make rules and dependencies not useful
|
||||||
(and sometimes confusing) to the casual installer
|
(and sometimes confusing) to the casual installer
|
||||||
--enable-multilib build many library versions (default)
|
|
||||||
--disable-symvers disable symbol versioning for libquadmath
|
--disable-symvers disable symbol versioning for libquadmath
|
||||||
--enable-generated-files-in-srcdir
|
--enable-generated-files-in-srcdir
|
||||||
put copies of generated files in source dir intended
|
put copies of generated files in source dir intended
|
||||||
|
@ -2370,6 +2370,44 @@ esac
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# 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"
|
||||||
|
|
||||||
|
|
||||||
target_alias=${target_alias-$host_alias}
|
target_alias=${target_alias-$host_alias}
|
||||||
|
|
||||||
|
|
||||||
|
@ -10527,7 +10565,7 @@ else
|
||||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||||
lt_status=$lt_dlunknown
|
lt_status=$lt_dlunknown
|
||||||
cat > conftest.$ac_ext <<_LT_EOF
|
cat > conftest.$ac_ext <<_LT_EOF
|
||||||
#line 10530 "configure"
|
#line 10568 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#if HAVE_DLFCN_H
|
#if HAVE_DLFCN_H
|
||||||
|
@ -10633,7 +10671,7 @@ else
|
||||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||||
lt_status=$lt_dlunknown
|
lt_status=$lt_dlunknown
|
||||||
cat > conftest.$ac_ext <<_LT_EOF
|
cat > conftest.$ac_ext <<_LT_EOF
|
||||||
#line 10636 "configure"
|
#line 10674 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#if HAVE_DLFCN_H
|
#if HAVE_DLFCN_H
|
||||||
|
@ -10918,43 +10956,6 @@ fi
|
||||||
MAINT=$MAINTAINER_MODE_TRUE
|
MAINT=$MAINTAINER_MODE_TRUE
|
||||||
|
|
||||||
|
|
||||||
# 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_ext=c
|
ac_ext=c
|
||||||
ac_cpp='$CPP $CPPFLAGS'
|
ac_cpp='$CPP $CPPFLAGS'
|
||||||
|
@ -13644,6 +13645,20 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||||
#
|
#
|
||||||
# INIT-COMMANDS
|
# INIT-COMMANDS
|
||||||
#
|
#
|
||||||
|
|
||||||
|
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"
|
||||||
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
|
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
|
||||||
|
|
||||||
|
|
||||||
|
@ -13906,20 +13921,6 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
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
|
_ACEOF
|
||||||
|
|
||||||
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||||
|
@ -13929,9 +13930,9 @@ for ac_config_target in $ac_config_targets
|
||||||
do
|
do
|
||||||
case $ac_config_target in
|
case $ac_config_target in
|
||||||
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
||||||
|
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
|
||||||
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
|
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
|
||||||
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
|
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
|
||||||
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
|
|
||||||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||||
|
|
||||||
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
||||||
|
@ -14517,6 +14518,14 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
|
||||||
|
|
||||||
|
|
||||||
case $ac_file$ac_mode in
|
case $ac_file$ac_mode 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 ;;
|
||||||
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
|
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
|
||||||
# Autoconf 2.62 quotes --file arguments for eval, but not when files
|
# Autoconf 2.62 quotes --file arguments for eval, but not when files
|
||||||
# are listed without --file. Let's play safe and only enable the eval
|
# are listed without --file. Let's play safe and only enable the eval
|
||||||
|
@ -15251,14 +15260,6 @@ _LT_EOF
|
||||||
chmod +x "$ofile"
|
chmod +x "$ofile"
|
||||||
|
|
||||||
;;
|
;;
|
||||||
"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
|
esac
|
||||||
done # for ac_tag
|
done # for ac_tag
|
||||||
|
|
|
@ -23,6 +23,8 @@ AC_CONFIG_HEADER(config.h)
|
||||||
AC_CANONICAL_SYSTEM
|
AC_CANONICAL_SYSTEM
|
||||||
ACX_NONCANONICAL_TARGET
|
ACX_NONCANONICAL_TARGET
|
||||||
|
|
||||||
|
AM_ENABLE_MULTILIB(, ..)
|
||||||
|
|
||||||
target_alias=${target_alias-$host_alias}
|
target_alias=${target_alias-$host_alias}
|
||||||
AC_SUBST(target_alias)
|
AC_SUBST(target_alias)
|
||||||
|
|
||||||
|
@ -60,7 +62,6 @@ AC_SUBST(enable_shared)
|
||||||
AC_SUBST(enable_static)
|
AC_SUBST(enable_static)
|
||||||
|
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
AM_ENABLE_MULTILIB(, ..)
|
|
||||||
|
|
||||||
AC_LANG_C
|
AC_LANG_C
|
||||||
# The same as in boehm-gc and libstdc++. Have to borrow it from there.
|
# The same as in boehm-gc and libstdc++. Have to borrow it from there.
|
||||||
|
|
Loading…
Reference in New Issue