Bug 1112186: Honor --disable-debug-rtl on Windows, r=glandium LDAPCSDK_20141216_607G_RTM LDAPCSDK_6_0_7G_RTM
authorJoshua Cranmer <Pidgeot18@gmail.com>
Tue, 16 Dec 2014 11:51:36 -0600
changeset 41 cfc95f7a6206
parent 40 91917f608ab8
child 42 d7a34d414754
push id28
push userPidgeot18@gmail.com
push dateWed, 17 Dec 2014 03:34:45 +0000
reviewersglandium
bugs1112186
Bug 1112186: Honor --disable-debug-rtl on Windows, r=glandium
c-sdk/configure
c-sdk/configure.in
--- a/c-sdk/configure
+++ b/c-sdk/configure
@@ -3682,17 +3682,17 @@ CYGWIN32_NT|CYGWIN_NT*|MINGW*_NT*)
     if echo "$CPU_ARCH" | grep -c 86 >/dev/null; then
         CPU_ARCH=x86
     fi
     ;;
 esac
 
 if test -n "$MOZILLA_CLIENT" && test "$OS_ARCH" = "WINNT"; then
     OS_TARGET=WIN95
-    if test -n "$MOZ_DEBUG"; then
+    if test -n "$MOZ_DEBUG" -a -z "$USE_DEBUG_RTL"; then
         USE_DEBUG_RTL=1
     fi
 fi
 if test -z "$OS_TARGET"; then
     OS_TARGET=$OS_ARCH
 fi
 if test "$OS_TARGET" = "WIN95"; then
     OS_RELEASE="4.0"
--- a/c-sdk/configure.in
+++ b/c-sdk/configure.in
@@ -882,17 +882,17 @@ CYGWIN32_NT|CYGWIN_NT*|MINGW*_NT*)
     if echo "$CPU_ARCH" | grep -c 86 >/dev/null; then
         CPU_ARCH=x86
     fi
     ;;
 esac
 
 if test -n "$MOZILLA_CLIENT" && test "$OS_ARCH" = "WINNT"; then
     OS_TARGET=WIN95
-    if test -n "$MOZ_DEBUG"; then
+    if test -n "$MOZ_DEBUG" -a -z "$USE_DEBUG_RTL"; then
         USE_DEBUG_RTL=1
     fi
 fi
 if test -z "$OS_TARGET"; then
     OS_TARGET=$OS_ARCH
 fi
 if test "$OS_TARGET" = "WIN95"; then
     OS_RELEASE="4.0"