From 925595259b51dd84711b620afdf02245e537a38f Mon Sep 17 00:00:00 2001 From: Mikko Koppanen Date: Wed, 17 Nov 2010 15:06:51 +0100 Subject: MinGW32 build fixes After long discussions in IRC we came to conclusion that there is no elegant way to handle static builds with MinGW32. This patch sets AC_DISABLE_STATIC by default on MinGW32 and Cygwin Signed-off-by: Mikko Koppanen --- configure.in | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 700a9d1..5de0922 100644 --- a/configure.in +++ b/configure.in @@ -33,11 +33,15 @@ AC_PROG_CC AC_PROG_CC_C99 AC_PROG_CXX AM_PROG_CC_C_O -AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL AC_PROG_SED AC_PROG_AWK +# Host specific checks +AC_CANONICAL_HOST + +# Libtool configuration for different targets. See acinclude.m4 +AC_CONFIG_LIBTOOL + # Check for ICC and Sun Studio compilers AC_LANG(C) AC_CHECK_LANG_ICC @@ -82,9 +86,6 @@ werror="yes" # Whether we are on mingw or not. on_mingw32="no" -# Host speciffic checks -AC_CANONICAL_HOST - # Set some default features required by 0MQ code. CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE $CPPFLAGS" @@ -194,6 +195,10 @@ case "${host_os}" in # mingw32 defines __int64_t as long long CPPFLAGS="-Wno-long-long ${CPPFLAGS} " on_mingw32="yes" + + if test "x$enable_static" = "xyes"; then + AC_MSG_ERROR([Building static libraries is not supported under MinGW32]) + fi ;; *cygwin*) # Define on Cygwin to enable all library features @@ -204,6 +209,10 @@ case "${host_os}" in LDFLAGS="${LDFLAGS} -L/usr/lib/e2fsprogs" AC_CHECK_LIB(uuid, uuid_generate, , [AC_MSG_ERROR([cannot link with -luuid, install the e2fsprogs package.])]) + + if test "x$enable_static" = "xyes"; then + AC_MSG_ERROR([Building static libraries is not supported under Cygwin]) + fi ;; *) AC_MSG_ERROR([unsupported system: ${host_os}.]) -- cgit v1.2.3