Move defines from config.mk into configure.in

config/autoconf.mk.in

@@ -88,8 +88,6 @@ ClientWallet=1
 CookieManagement=1
 SingleSignon=1
 
-MOZ_OJI=1
-
 MOZ_POST_DSO_LIB_COMMAND = @MOZ_POST_DSO_LIB_COMMAND@
 MOZ_POST_PROGRAM_COMMAND = @MOZ_POST_PROGRAM_COMMAND@
 

config/config.mk

@@ -528,15 +528,10 @@ endif
 DEFINES		+= -DOSTYPE=\"$(OS_CONFIG)\"
 DEFINES		+= -DOSARCH=\"$(OS_ARCH)\"
 
-DEFINES += -DNS_PRINT_PREVIEW
-
-ifdef MOZ_DEBUG
-DEFINES		+= -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP
-endif
-
 #
 # Platform dependent switching off of JAVA
 #
+MOZ_OJI=1
 
 ifdef MOZ_JAVA
 DEFINES		+= -DJAVA

configure.in

@@ -4055,7 +4055,12 @@ else
 fi
 
 AC_DEFINE(JS_THREADSAFE)
+AC_DEFINE(NS_PRINT_PREVIEW)
 
+if test "$MOZ_DEBUG"; then
+    AC_DEFINE(MOZ_REFLOW_PERF)
+    AC_DEFINE(MOZ_REFLOW_PERF_DSP)
+endif
 
 # Used for LD_LIBRARY_PATH of run_viewer target
 LIBS_PATH=