Kaydet (Commit) ce53d3d2 authored tarafından David Tardon's avatar David Tardon

drop obsolete configure options

Change-Id: I396998d66bbe4d46b6a19d9ccb3b15d127ead233
üst 2114e88f
...@@ -2346,32 +2346,14 @@ AC_ARG_WITH(macosx-version-max-allowed, ...@@ -2346,32 +2346,14 @@ AC_ARG_WITH(macosx-version-max-allowed,
dnl =================================================================== dnl ===================================================================
dnl options for stuff used during cross-compilation build dnl options for stuff used during cross-compilation build
dnl These are superseded by --with-build-platform-configure-options. dnl Not quite superseded by --with-build-platform-configure-options.
dnl Or are they? Look for the complicated tests for "$cross_compiling" = "yes" -a \( dnl TODO: check, if the "force" option is still needed anywhere.
dnl "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" = "force" \)
dnl far below. Could whoever understands MinGW cross-compilation clean up this please.
dnl =================================================================== dnl ===================================================================
AC_ARG_WITH(system-boost-for-build,
AS_HELP_STRING([--with-system-boost-for-build],
[Use boost already on system for build tools (cross-compilation only).]))
AC_ARG_WITH(system-cppunit-for-build,
AS_HELP_STRING([--with-system-cppunit-for-build],
[Use cppunit already on system for build tools (cross-compilation only).]))
AC_ARG_WITH(system-expat-for-build,
AS_HELP_STRING([--with-system-expat-for-build],
[Use expat already on system for build tools (cross-compilation only).]))
AC_ARG_WITH(system-icu-for-build, AC_ARG_WITH(system-icu-for-build,
AS_HELP_STRING([--with-system-icu-for-build=yes/no/force], AS_HELP_STRING([--with-system-icu-for-build=yes/no/force],
[Use icu already on system for build tools (cross-compilation only).])) [Use icu already on system for build tools (cross-compilation only).]))
AC_ARG_WITH(system-libxml-for-build,
AS_HELP_STRING([--with-system-libxml-for-build],
[Use libxml/libxslt already on system for build tools (cross-compilation only).]))
dnl =================================================================== dnl ===================================================================
dnl check for required programs (grep, awk, sed, bash) dnl check for required programs (grep, awk, sed, bash)
...@@ -4705,11 +4687,7 @@ if test "$cross_compiling" = "yes"; then ...@@ -4705,11 +4687,7 @@ if test "$cross_compiling" = "yes"; then
test -n "$with_ant_home" && sub_conf_opts="$sub_conf_opts --with-ant-home=$with_ant_home" test -n "$with_ant_home" && sub_conf_opts="$sub_conf_opts --with-ant-home=$with_ant_home"
test $with_junit = no && sub_conf_opts="$sub_conf_opts --without-junit" test $with_junit = no && sub_conf_opts="$sub_conf_opts --without-junit"
test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts --with-external-tar=$TARFILE_LOCATION" test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts --with-external-tar=$TARFILE_LOCATION"
test -n "$with_system_boost_for_build" && sub_conf_opts="$sub_conf_opts --with-system-boost=$with_system_boost_for_build"
test -n "$with_system_cppunit_for_build" && sub_conf_opts="$sub_conf_opts --with-system-cppunit=$with_system_cppunit_for_build"
test -n "$with_system_expat_for_build" && sub_conf_opts="$sub_conf_opts --with-system-expat=$with_system_expat_for_build"
test "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" = "force" && sub_conf_opts="$sub_conf_opts --with-system-icu" test "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" = "force" && sub_conf_opts="$sub_conf_opts --with-system-icu"
test -n "$with_system_libxml_for_build" && sub_conf_opts="$sub_conf_opts --with-system-libxml=$with_system_libxml_for_build"
# we need the msi build tools on mingw if we are creating the # we need the msi build tools on mingw if we are creating the
# installation set # installation set
if test "$WITH_MINGW" = "yes"; then if test "$WITH_MINGW" = "yes"; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment