From b0f2b8690d99ded2de1a9e45cd72fe8b4423e19b Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Fri, 13 Dec 2002 01:47:12 +0000 Subject: [PATCH] Add check for ml.exe when building psm on win32. Bug #164646 r=bryner git-svn-id: svn://10.0.0.236/trunk@135211 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/configure.in | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/mozilla/configure.in b/mozilla/configure.in index 369ac68e649..75456d13cde 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -145,7 +145,8 @@ case "$target" in AC_CHECK_PROGS(CXX, cl) AC_CHECK_PROGS(LD, link) AC_CHECK_PROGS(MIDL, midl) - + AC_PATH_PROGS(AS, ml) + # Make sure compilers are valid CFLAGS="$CFLAGS -TC" CXXFLAGS="$CXXFLAGS -TP" @@ -3300,10 +3301,17 @@ fi dnl ======================================================== dnl = Build Personal Security Manager dnl ======================================================== -MOZ_PSM= MOZ_ARG_ENABLE_BOOL(crypto, [ --enable-crypto Enable crypto support (Personal Security Manager)], - MOZ_PSM=1 ) + MOZ_PSM=1, + MOZ_PSM= ) +case $target in +*-cygwin*|*-mingw*|*-msvc*|*-mksnt*) + if test -n "$MOZ_PSM" -a ! -e "$AS_BIN"; then + AC_MSG_ERROR([Building crypto support requires a valid version of the standalone assembler, ml.exe.]) + fi + ;; +esac dnl ======================================================== dnl = JS Debugger XPCOM component (js/jsd)