configure.in: Handle --disable-<component> generically.
* configure.in: Handle --disable-<component> generically. * configure: Regenerate. From-SVN: r111941
This commit is contained in:
parent
a859786636
commit
27079765d0
|
@ -1,3 +1,8 @@
|
||||||
|
2006-03-10 Aldy Hernandez <aldyh@redhat.com>
|
||||||
|
|
||||||
|
* configure.in: Handle --disable-<component> generically.
|
||||||
|
* configure: Regenerate.
|
||||||
|
|
||||||
2006-03-01 H.J. Lu <hongjiu.lu@intel.com>
|
2006-03-01 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
PR libgcj/17311
|
PR libgcj/17311
|
||||||
|
|
39
configure.in
39
configure.in
|
@ -305,7 +305,6 @@ AC_ARG_ENABLE(libada,
|
||||||
ENABLE_LIBADA=$enableval,
|
ENABLE_LIBADA=$enableval,
|
||||||
ENABLE_LIBADA=yes)
|
ENABLE_LIBADA=yes)
|
||||||
if test "${ENABLE_LIBADA}" != "yes" ; then
|
if test "${ENABLE_LIBADA}" != "yes" ; then
|
||||||
noconfigdirs="$noconfigdirs target-libada"
|
|
||||||
noconfigdirs="$noconfigdirs gnattools"
|
noconfigdirs="$noconfigdirs gnattools"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -313,9 +312,6 @@ AC_ARG_ENABLE(libssp,
|
||||||
[ --enable-libssp Builds libssp directory],
|
[ --enable-libssp Builds libssp directory],
|
||||||
ENABLE_LIBSSP=$enableval,
|
ENABLE_LIBSSP=$enableval,
|
||||||
ENABLE_LIBSSP=yes)
|
ENABLE_LIBSSP=yes)
|
||||||
if test "${ENABLE_LIBSSP}" != "yes" ; then
|
|
||||||
noconfigdirs="$noconfigdirs target-libssp"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Set the default so we build libgcc-math for ix86 and x86_64
|
# Set the default so we build libgcc-math for ix86 and x86_64
|
||||||
AC_ARG_ENABLE(libgcc-math,
|
AC_ARG_ENABLE(libgcc-math,
|
||||||
|
@ -328,9 +324,6 @@ case "${target}" in
|
||||||
enable_libgcc_math=no ;;
|
enable_libgcc_math=no ;;
|
||||||
esac
|
esac
|
||||||
])
|
])
|
||||||
if test "${enable_libgcc_math}" != "yes"; then
|
|
||||||
noconfigdirs="$noconfigdirs target-libgcc-math"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Save it here so that, even in case of --enable-libgcj, if the Java
|
# Save it here so that, even in case of --enable-libgcj, if the Java
|
||||||
# front-end isn't enabled, we still get libgcj disabled.
|
# front-end isn't enabled, we still get libgcj disabled.
|
||||||
|
@ -349,14 +342,8 @@ no)
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
||||||
# Allow --disable-libmudflap to exclude target-libmudflap
|
# Disable libmudflap on some systems.
|
||||||
case $enable_libmudflap in
|
if test x$enable_libmudflap = x ; then
|
||||||
yes)
|
|
||||||
;;
|
|
||||||
no)
|
|
||||||
noconfigdirs="$noconfigdirs target-libmudflap"
|
|
||||||
;;
|
|
||||||
"")
|
|
||||||
case "${target}" in
|
case "${target}" in
|
||||||
*-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
|
*-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
|
||||||
# Enable libmudflap by default in GNU and friends.
|
# Enable libmudflap by default in GNU and friends.
|
||||||
|
@ -369,16 +356,10 @@ no)
|
||||||
noconfigdirs="$noconfigdirs target-libmudflap"
|
noconfigdirs="$noconfigdirs target-libmudflap"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
esac
|
fi
|
||||||
|
|
||||||
# Allow --disable-libgomp to exclude target-libgomp
|
# Disable libgomp on non POSIX hosted systems.
|
||||||
case $enable_libgomp in
|
if test x$enable_libgomp = x ; then
|
||||||
yes)
|
|
||||||
;;
|
|
||||||
no)
|
|
||||||
noconfigdirs="$noconfigdirs target-libgomp"
|
|
||||||
;;
|
|
||||||
"")
|
|
||||||
# Enable libgomp by default on hosted POSIX systems.
|
# Enable libgomp by default on hosted POSIX systems.
|
||||||
case "${target}" in
|
case "${target}" in
|
||||||
*-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
|
*-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
|
||||||
|
@ -393,7 +374,7 @@ no)
|
||||||
noconfigdirs="$noconfigdirs target-libgomp"
|
noconfigdirs="$noconfigdirs target-libgomp"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
esac
|
fi
|
||||||
|
|
||||||
|
|
||||||
case "${target}" in
|
case "${target}" in
|
||||||
|
@ -1337,6 +1318,14 @@ Recognised languages are: ${potential_languages}])
|
||||||
ac_configure_args=`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[[^ ]]*//' -e 's/$/ --enable-languages='"$enable_languages"/ `
|
ac_configure_args=`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[[^ ]]*//' -e 's/$/ --enable-languages='"$enable_languages"/ `
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Handle --disable-<component> generically.
|
||||||
|
for dir in $configdirs $build_configdirs $target_configdirs ; do
|
||||||
|
dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g`
|
||||||
|
if eval test x\${enable_${dirname}} "=" xno ; then
|
||||||
|
noconfigdirs="$noconfigdirs $dir"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
# Remove the entries in $skipdirs and $noconfigdirs from $configdirs,
|
# Remove the entries in $skipdirs and $noconfigdirs from $configdirs,
|
||||||
# $build_configdirs and $target_configdirs.
|
# $build_configdirs and $target_configdirs.
|
||||||
# If we have the source for $noconfigdirs entries, add them to $notsupp.
|
# If we have the source for $noconfigdirs entries, add them to $notsupp.
|
||||||
|
|
Loading…
Reference in New Issue