From 00a86735592ce44e7c38245e866b3a3ed49547ab Mon Sep 17 00:00:00 2001 From: Patrick McFarland Date: Tue, 6 Mar 2012 17:06:24 -0500 Subject: [PATCH] Make the Win32 check do what was actually intended --- configure | 6 ++---- configure.ac | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 0d2d750..02d3b9b 100755 --- a/configure +++ b/configure @@ -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 : @@ -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 : @@ -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" diff --git a/configure.ac b/configure.ac index d01b8af..f994ecb 100644 --- a/configure.ac +++ b/configure.ac @@ -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"], [ @@ -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"], [ @@ -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" ]) ;;