Bug 1113863 - Do not set USE_DEBUG_RTL if using --disable-debug-rtl explicitly. r=jcranmer LDAPCSDK_20150127_607H_RTM LDAPCSDK_6_0_7H_RTM
authorHiroyuki Ikezoe <hiikezoe@mozilla-japan.org>
Tue, 27 Jan 2015 12:33:31 +0100
changeset 43 0688442b9383
parent 42 d7a34d414754
child 44 ff2dacee5458
push id29
push usermozilla@kewis.ch
push dateTue, 27 Jan 2015 11:38:33 +0000
reviewersjcranmer
bugs1113863
Bug 1113863 - Do not set USE_DEBUG_RTL if using --disable-debug-rtl explicitly. r=jcranmer
c-sdk/configure
c-sdk/configure.in
--- a/c-sdk/configure
+++ b/c-sdk/configure
@@ -896,18 +896,20 @@ else
   OS_TARGET=
 fi
 
 
 # Check whether --enable-debug-rtl or --disable-debug-rtl was given.
 if test "${enable_debug_rtl+set}" = set; then
   enableval="$enable_debug_rtl"
    if test "$enableval" = "yes"; then
-	    USE_DEBUG_RTL=1
-      fi 
+       USE_DEBUG_RTL=1
+   else
+       USE_DEBUG_RTL=0
+   fi
 fi
 
 
 # Check whether --enable-n32 or --disable-n32 was given.
 if test "${enable_n32+set}" = set; then
   enableval="$enable_n32"
    if test "$enableval" = "yes"; then
 	USE_N32=1
@@ -4812,17 +4814,17 @@ fi
         DLLFLAGS="$DLLFLAGS -OUT:\"\$@\""
 
         _DEBUG_FLAGS=-Z7
         _OPTIMIZE_FLAGS=-O2
         if test -z "$MOZ_OPTIMIZE"; then
             CFLAGS="$CFLAGS -Od"
         fi
 
-        if test -n "$USE_DEBUG_RTL"; then
+        if test "$USE_DEBUG_RTL" = 1; then
             CFLAGS="$CFLAGS -MDd"
         else
             CFLAGS="$CFLAGS -MD"
         fi
 
         if test -n "$MOZ_DEBUG"; then
             cat >> confdefs.h <<\EOF
 #define _DEBUG 1
--- a/c-sdk/configure.in
+++ b/c-sdk/configure.in
@@ -180,17 +180,19 @@ AC_ARG_ENABLE(win32-target,
     [  --enable-win32-target=\$t
                           Specify win32 flavor. (WIN95 or WINNT)],
     OS_TARGET=`echo $enableval | tr a-z A-Z`,
     OS_TARGET=)
 
 AC_ARG_ENABLE(debug-rtl,
     [  --enable-debug-rtl      Use the MSVC debug runtime library],
     [ if test "$enableval" = "yes"; then
-	    USE_DEBUG_RTL=1
+          USE_DEBUG_RTL=1
+      else
+          USE_DEBUG_RTL=0
       fi ])
 
 AC_ARG_ENABLE(n32,
     [  --enable-n32            Enable n32 ABI support (IRIX only)],
     [ if test "$enableval" = "yes"; then
 	USE_N32=1
       else if test "$enableval" = "no"; then
 	USE_N32=
@@ -1607,17 +1609,17 @@ tools are selected during the Xcode/Deve
         DLLFLAGS="$DLLFLAGS -OUT:\"\$@\""
 
         _DEBUG_FLAGS=-Z7
         _OPTIMIZE_FLAGS=-O2
         if test -z "$MOZ_OPTIMIZE"; then
             CFLAGS="$CFLAGS -Od"
         fi
 
-        if test -n "$USE_DEBUG_RTL"; then
+        if test "$USE_DEBUG_RTL" = 1; then
             CFLAGS="$CFLAGS -MDd"
         else
             CFLAGS="$CFLAGS -MD"
         fi
 
         if test -n "$MOZ_DEBUG"; then
             AC_DEFINE(_DEBUG)
         else