Bug 1490765 - delete code for application-specific subconfigure scripts; r=nalexander
authorNathan Froyd <froydnj@mozilla.com>
Wed, 12 Sep 2018 16:22:10 -0400
changeset 491812 18052fbb9d6d6225eeecdd3d0e36d8048f4d3d1b
parent 491811 7a1e3ad7a911dadcab91b767f1a2f3535b48980e
child 491813 0d8d4803236e5ee1300d0c95f73c5e57f3ade2dc
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1490765
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1490765 - delete code for application-specific subconfigure scripts; r=nalexander We don't need this code nowadays, and it probably doesn't work anyway.
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -3564,35 +3564,16 @@ else
   case "${target}" in
   *-mingw*)
     export MOZ_NO_DEBUG_RTL=1
     ;;
   esac
 fi # MOZ_MEMORY
 AC_SUBST(MOZ_GLUE_IN_PROGRAM)
 
-# Allow the application to provide a subconfigure script.
-# This should be after 'export MOZ_NO_DEBUG_RTL=1' since
-# ldap/c-sdk/configure refers to the enviroment value.
-if test -f "${srcdir}/${MOZ_BUILD_APP}/configure.in" ; then
-  do_output_subdirs() {
-    if test -n "$_subconfigure_subdirs"; then
-      AC_MSG_ERROR([Cannot specify more than one sub-sub-configure])
-     fi
-    _subconfigure_subdir="$1"
-    _subconfigure_config_args="$ac_configure_args"
-  }
-  tmpscript=`$PYTHON -c 'import os, tempfile; print tempfile.mktemp(prefix="subscript.").replace(os.sep, "/")'` || exit 1
-  m4 "${srcdir}/build/autoconf/subconfigure.m4" \
-     "${srcdir}/build/autoconf/altoptions.m4" \
-     "${srcdir}/${MOZ_BUILD_APP}/configure.in" > $tmpscript
-  . $tmpscript
-  rm -f $tmpscript
-fi
-
 AC_SUBST_LIST(MOZ_GLUE_WRAP_LDFLAGS)
 export MOZ_GLUE_WRAP_LDFLAGS
 
 dnl ========================================================
 dnl = Enable using the clang plugin to build
 dnl ========================================================
 
 if test -n "$COMPILE_ENVIRONMENT"; then