Verified that the autoconf build system is equivalent to the classic
authorwtc%netscape.com
Thu, 17 May 2001 01:46:09 +0000
changeset 1881 cb0760b6f46191e3f69ff07cae05b0005db2f1d8
parent 1880 44f67a943da45314671154a37234556450ac70bb
child 1882 e688538c9d7b2cf027eb5899f4bc1d0f79e9cb55
push idunknown
push userunknown
push dateunknown
Verified that the autoconf build system is equivalent to the classic build system on Win32. Modified Files: configure configure.in
configure
configure.in
--- a/configure
+++ b/configure
@@ -3591,44 +3591,44 @@ EOF
             fi
             OPTIMIZER="-Od -Z7"
             DLLFLAGS='-DEBUG -DEBUGTYPE:CV -OUT:"$@"'
             if test -n "$GLOWCODE"; then
                 DLLFLAGS='-DEBUG -DEBUGTYPE:both -INCLUDE:_GlowCode -OUT:"$@"'
                 DLL_LIBS='$(GLOWDIR)/glowcode.lib'
             fi
             OBJDIR_TAG=_DBG
-            LDFLAGS="$LDFLAGS -DEBUG -DEBUGTYPE:CV"
+            LDFLAGS="-DEBUG -DEBUGTYPE:CV"
             if test -n "$PROFILE"; then
                 LDFLAGS="$LDFLAGS -PROFILE -MAP"
                 DLLFLAGS="$DLLFLAGS -PROFILE -MAP"
             fi
         fi
         
         if test "$OS_TARGET" = "WINNT"; then
             CFLAGS="$CFLAGS -GT"
+            if test "$CPU_ARCH" = "x86"; then
+                CFLAGS="$CFLAGS -G5"
+            fi
             LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
             LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
         else
             LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
             LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
         fi
     fi # GNU_CC
 
     if test -n "$USE_STATIC_TLS"; then
         cat >> confdefs.h <<\EOF
 #define _PR_USE_STATIC_TLS 1
 EOF
 
     fi
 
     if test "$OS_TARGET" = "WINNT"; then
-        if test "$CPU_ARCH" = "x86"; then
-            CFLAGS="$CFLAGS -G5"
-        fi
         cat >> confdefs.h <<\EOF
 #define WINNT 1
 EOF
 
     else
         cat >> confdefs.h <<\EOF
 #define WIN95 1
 EOF
--- a/configure.in
+++ b/configure.in
@@ -1108,41 +1108,41 @@ case "$target" in
             fi
             OPTIMIZER="-Od -Z7"
             DLLFLAGS='-DEBUG -DEBUGTYPE:CV -OUT:"$@"'
             if test -n "$GLOWCODE"; then
                 DLLFLAGS='-DEBUG -DEBUGTYPE:both -INCLUDE:_GlowCode -OUT:"$@"'
                 DLL_LIBS='$(GLOWDIR)/glowcode.lib'
             fi
             OBJDIR_TAG=_DBG
-            LDFLAGS="$LDFLAGS -DEBUG -DEBUGTYPE:CV"
+            LDFLAGS="-DEBUG -DEBUGTYPE:CV"
             if test -n "$PROFILE"; then
                 LDFLAGS="$LDFLAGS -PROFILE -MAP"
                 DLLFLAGS="$DLLFLAGS -PROFILE -MAP"
             fi
         fi
         
         if test "$OS_TARGET" = "WINNT"; then
             CFLAGS="$CFLAGS -GT"
+            if test "$CPU_ARCH" = "x86"; then
+                CFLAGS="$CFLAGS -G5"
+            fi
             LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
             LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
         else
             LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
             LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
         fi
     fi # GNU_CC
 
     if test -n "$USE_STATIC_TLS"; then
         AC_DEFINE(_PR_USE_STATIC_TLS)
     fi
 
     if test "$OS_TARGET" = "WINNT"; then
-        if test "$CPU_ARCH" = "x86"; then
-            CFLAGS="$CFLAGS -G5"
-        fi
         AC_DEFINE(WINNT)
     else
         AC_DEFINE(WIN95)
         AC_DEFINE(_PR_GLOBAL_THREADS_ONLY)
     fi
 
     if test "$CPU_ARCH" = "x86"; then
         CPU_ARCH_TAG=