From 29639a0638bc94b84dcf7c322fddd573d86cb335 Mon Sep 17 00:00:00 2001 From: "leaf%mozilla.org" Date: Sun, 12 Aug 2001 04:28:56 +0000 Subject: [PATCH] Automated update git-svn-id: svn://10.0.0.236/trunk@100891 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/configure | 107 ---------------------------------------------- 1 file changed, 107 deletions(-) diff --git a/mozilla/configure b/mozilla/configure index e31f00e36d4..e1cfd912a08 100755 --- a/mozilla/configure +++ b/mozilla/configure @@ -12893,7 +12893,6 @@ EOF - if test "$USING_HCC"; then CC='${topsrcdir}/build/hcc' CC="$CC '$_OLDCC'" @@ -13440,7 +13439,6 @@ s%@OBJ_SUFFIX@%$OBJ_SUFFIX%g s%@BIN_SUFFIX@%$BIN_SUFFIX%g s%@ASM_SUFFIX@%$ASM_SUFFIX%g s%@USE_N32@%$USE_N32%g -s%@MOZ_NSS_AUTOCONF@%$MOZ_NSS_AUTOCONF%g s%@HAVE_MOVEMAIL@%$HAVE_MOVEMAIL%g s%@LIBS_PATH@%$LIBS_PATH%g s%@MOZ_DEFINES@%$MOZ_DEFINES%g @@ -13808,108 +13806,3 @@ if test "$no_recursion" != yes; then fi fi - -if test "$MOZ_PSM" && test -n "$MOZ_NSS_AUTOCONF"; then - if test ! -d security; then - rm -rf security; mkdir security - fi - ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla --disable-cmd" - -if test "$no_recursion" != yes; then - - # Remove --cache-file and --srcdir arguments so they do not pile up. - ac_sub_configure_args= - ac_prev= - for ac_arg in $ac_configure_args; do - if test -n "$ac_prev"; then - ac_prev= - continue - fi - case "$ac_arg" in - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; - esac - done - - for ac_config_dir in security/nss; do - - # Do not complain, so a configure script can configure whichever - # parts of a large source tree are present. - if test ! -d $srcdir/$ac_config_dir; then - continue - fi - - echo configuring in $ac_config_dir - - case "$srcdir" in - .) ;; - *) - if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; - else - { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } - fi - ;; - esac - - ac_popdir=`pwd` - cd $ac_config_dir - - # A "../" for each directory in /$ac_config_dir. - ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` - - case "$srcdir" in - .) # No --srcdir option. We are building in place. - ac_sub_srcdir=$srcdir ;; - /*) # Absolute path. - ac_sub_srcdir=$srcdir/$ac_config_dir ;; - *) # Relative path. - ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; - esac - - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_sub_srcdir/configure; then - ac_sub_configure=$ac_sub_srcdir/configure - elif test -f $ac_sub_srcdir/configure.in; then - ac_sub_configure=$ac_configure - else - echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 - ac_sub_configure= - fi - - # The recursion is here. - if test -n "$ac_sub_configure"; then - - # Make the cache file name correct relative to the subdirectory. - case "$cache_file" in - /*) ac_sub_cache_file=$cache_file ;; - *) # Relative path. - ac_sub_cache_file="$ac_dots$cache_file" ;; - esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - - echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" - # The eval makes quoting arguments work. - if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir - then : - else - { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } - fi - fi - - cd $ac_popdir - done -fi - -fi