Fix win32 build.

loongson-zjl · Mar 5, 2012 · 139fc63 · 139fc63
1 parent f658bdd
commit 139fc63
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/configure b/configure
@@ -3879,6 +3879,7 @@ fi
 LIBMOWGLI_MODULES="core base atomic container eventloop ext module object thread vio"
 
 
+BUILD_SHARED_MODULES=""
 LIBMOWGLI_SHARED_MODULES=""
 # Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then :
@@ -4011,8 +4012,11 @@ $as_echo "no" >&6; }
       LIBMOWGLI_SHARED_MODULES="$LIBMOWGLI_SHARED_MODULES $i/mowgli.$i.lib.a"
    done
 
+   BUILD_SHARED_MODULES="yes"
+
 fi
 
+BUILD_STATIC_MODULES=""
 LIBMOWGLI_STATIC_MODULES=""
 # Check whether --enable-static was given.
 if test "${enable_static+set}" = set; then :
@@ -4029,6 +4033,8 @@ if test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"; then :
       LIBMOWGLI_STATIC_MODULES="$LIBMOWGLI_STATIC_MODULES $i/mowgli.$i.a"
    done
 
+   BUILD_STATIC_MODULES="yes"
+
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking OS type" >&5
@@ -4041,13 +4047,13 @@ $as_echo "win32" >&6; }
 
    LIBS="$LIBS -lwsock32 -lws2_32"
 
-   if test x$"LIBMOWGLI_SHARED_MODULES" = x"yes"; then :
+   if test x"$BUILD_SHARED_MODULES" = x"yes"; then :
 
       LIBMOWGLI_SHARED_MODULES="$LIBMOWGLI_SHARED_MODULES platform/win32/mowgli.platform.win32.lib.a"
 
 fi
 
-   if test x$"LIBMOWGLI_STATIC_MODULES" = x"yes"; then :
+   if test x"$BUILD_STATIC_MODULES" = x"yes"; then :
 
       LIBMOWGLI_STATIC_MODULES="$LIBMOWGLI_STATIC_MODULES platform/win32/mowgli.platform.win32.a"
 

diff --git a/configure.ac b/configure.ac
@@ -33,6 +33,7 @@ AC_PATH_PROG(RANLIB, ranlib)
 LIBMOWGLI_MODULES="core base atomic container eventloop ext module object thread vio"
 AC_SUBST(LIBMOWGLI_MODULES)
 
+BUILD_SHARED_MODULES=""
 LIBMOWGLI_SHARED_MODULES=""
 AC_ARG_ENABLE([shared], [AS_HELP_STRING([--disable-shared], [do not build shared library])]) 
 AS_IF([test x"$enable_shared" != x"no"], [ 
@@ -44,8 +45,11 @@ AS_IF([test x"$enable_shared" != x"no"], [
    do
       LIBMOWGLI_SHARED_MODULES="$LIBMOWGLI_SHARED_MODULES $i/mowgli.$i.lib.a"
    done
+
+   BUILD_SHARED_MODULES="yes"
 ])
 
+BUILD_STATIC_MODULES=""
 LIBMOWGLI_STATIC_MODULES=""
 AC_ARG_ENABLE([static], [AS_HELP_STRING([--enable-static], [build static library])])
 AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [
@@ -55,6 +59,8 @@ AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [
    do
       LIBMOWGLI_STATIC_MODULES="$LIBMOWGLI_STATIC_MODULES $i/mowgli.$i.a"
    done
+
+   BUILD_STATIC_MODULES="yes"
 ])
 
 AC_MSG_CHECKING(OS type)
@@ -65,11 +71,11 @@ case "$target" in
 
    LIBS="$LIBS -lwsock32 -lws2_32"
 
-   AS_IF([test x$"LIBMOWGLI_SHARED_MODULES" = x"yes"], [
+   AS_IF([test x"$BUILD_SHARED_MODULES" = x"yes"], [
       LIBMOWGLI_SHARED_MODULES="$LIBMOWGLI_SHARED_MODULES platform/win32/mowgli.platform.win32.lib.a"
    ])
 
-   AS_IF([test x$"LIBMOWGLI_STATIC_MODULES" = x"yes"], [
+   AS_IF([test x"$BUILD_STATIC_MODULES" = x"yes"], [
       LIBMOWGLI_STATIC_MODULES="$LIBMOWGLI_STATIC_MODULES platform/win32/mowgli.platform.win32.a"
    ])
    ;;