Skip to content

Commit

Permalink
Make the Win32 check do what was actually intended
Browse files Browse the repository at this point in the history
  • Loading branch information
Diablo-D3 committed Mar 6, 2012
1 parent 139fc63 commit 00a8673
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
6 changes: 2 additions & 4 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -3879,7 +3879,6 @@ 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 :
Expand Down Expand Up @@ -4016,7 +4015,6 @@ $as_echo "no" >&6; }
fi
BUILD_STATIC_MODULES=""
LIBMOWGLI_STATIC_MODULES=""
# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then :
Expand Down Expand Up @@ -4047,13 +4045,13 @@ $as_echo "win32" >&6; }
LIBS="$LIBS -lwsock32 -lws2_32"
if test x"$BUILD_SHARED_MODULES" = x"yes"; then :
if test x"$LIBMOWGLI_SHARED_MODULES" != x""; then :
LIBMOWGLI_SHARED_MODULES="$LIBMOWGLI_SHARED_MODULES platform/win32/mowgli.platform.win32.lib.a"
fi
if test x"$BUILD_STATIC_MODULES" = x"yes"; then :
if test x"$LIBMOWGLI_STATIC_MODULES" != x""; then :
LIBMOWGLI_STATIC_MODULES="$LIBMOWGLI_STATIC_MODULES platform/win32/mowgli.platform.win32.a"
Expand Down
6 changes: 2 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ 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"], [
Expand All @@ -49,7 +48,6 @@ AS_IF([test x"$enable_shared" != x"no"], [
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"], [
Expand All @@ -71,11 +69,11 @@ case "$target" in

LIBS="$LIBS -lwsock32 -lws2_32"

AS_IF([test x"$BUILD_SHARED_MODULES" = x"yes"], [
AS_IF([test x"$LIBMOWGLI_SHARED_MODULES" != x""], [
LIBMOWGLI_SHARED_MODULES="$LIBMOWGLI_SHARED_MODULES platform/win32/mowgli.platform.win32.lib.a"
])

AS_IF([test x"$BUILD_STATIC_MODULES" = x"yes"], [
AS_IF([test x"$LIBMOWGLI_STATIC_MODULES" != x""], [
LIBMOWGLI_STATIC_MODULES="$LIBMOWGLI_STATIC_MODULES platform/win32/mowgli.platform.win32.a"
])
;;
Expand Down

0 comments on commit 00a8673

Please sign in to comment.