Bugzilla bug 88535: backed out some of the changes made in the previous

checkin.  Modified files: configure configure.in

nsprpub/configure

@@ -5233,11 +5233,13 @@ if test -n "$_SAVE_OPTIMIZE_FLAGS"; then
 fi
 
 if test -n "$MOZ_OPTIMIZE"; then
-    OPTIMIZER=$_OPTIMIZE_FLAGS
+    CFLAGS="$CFLAGS $_OPTIMIZE_FLAGS"
+    CXXFLAGS="$CXXFLAGS $_OPTIMIZE_FLAGS"
 fi
 
 if test -n "$MOZ_DEBUG"; then
-    OPTIMIZER=$_DEBUG_FLAGS
+    CFLAGS="$CFLAGS $_DEBUG_FLAGS"
+    CXXFLAGS="$CXXFLAGS $_DEBUG_FLAGS"
 fi
 
 if test -n "$MOZ_OPTIMIZE"; then

nsprpub/configure.in

@@ -2109,11 +2109,13 @@ if test -n "$_SAVE_OPTIMIZE_FLAGS"; then
 fi
 
 if test -n "$MOZ_OPTIMIZE"; then
-    OPTIMIZER=$_OPTIMIZE_FLAGS
+    CFLAGS="$CFLAGS $_OPTIMIZE_FLAGS"
+    CXXFLAGS="$CXXFLAGS $_OPTIMIZE_FLAGS"
 fi
 
 if test -n "$MOZ_DEBUG"; then
-    OPTIMIZER=$_DEBUG_FLAGS
+    CFLAGS="$CFLAGS $_DEBUG_FLAGS"
+    CXXFLAGS="$CXXFLAGS $_DEBUG_FLAGS"
 fi
 
 if test -n "$MOZ_OPTIMIZE"; then