Bug 506493 - Resync' configure.in between c-c and m-c; (Jv1) Copy bug 529327.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sun, 28 Mar 2010 17:32:25 +0200
changeset 5302 871b3d26feec89eba40cebb75eb5dd3dcc4ff91d
parent 5301 c830226b182098fc09e435a6e2a3a289d665b9d8
child 5303 17581dee5a6873c85ce1cc5985061a4eac77e5ef
push id4090
push usersgautherie.bz@free.fr
push dateSun, 28 Mar 2010 15:45:27 +0000
treeherdercomm-central@cbe96b862e08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs506493, 529327
Bug 506493 - Resync' configure.in between c-c and m-c; (Jv1) Copy bug 529327. r=Callek. Bug 529327 - Undefined references to IID_* symbols on mingw
configure.in
--- a/configure.in
+++ b/configure.in
@@ -2192,20 +2192,22 @@ fi
         CXXFLAGS="$CXXFLAGS -mms-bitfields"
         DSO_LDOPTS='-shared'
         MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
         MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
         RC='$(WINDRES)'
         # Use temp file for windres (bug 213281)
         RCFLAGS='-O coff --use-temp-file'
         # mingw doesn't require kernel32, user32, and advapi32 explicitly
+if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
         LIBS="$LIBS -lgdi32 -lwinmm -lwsock32"
-        if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
-            MOZ_JS_LIBS='-L$(LIBXUL_DIST)/lib -ljs32$(VERSION_NUMBER)'
-        fi
+        MOZ_JS_LIBS='-L$(LIBXUL_DIST)/lib -ljs32$(VERSION_NUMBER)'
+else
+        LIBS="$LIBS -luuid -lgdi32 -lwinmm -lwsock32"
+fi
         MOZ_FIX_LINK_PATHS=
 if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
         DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom -lxpcom_core'
         XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/lib -lxpcom'
 else
         DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom -lxpcom_core -lmozalloc'
         XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/lib -lxpcom -lmozalloc'
 fi