From 425ca948c39b375b226d2112da3ccff24a36b976 Mon Sep 17 00:00:00 2001 From: Alexander Vdolainen Date: Thu, 21 Jan 2016 02:42:11 +0200 Subject: [PATCH] completely fixed issue with win32 option; --- configure.ac | 2 +- lib/Makefile.am | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 01c5e16..e49ea52 100644 --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,7 @@ case $host_os in esac -AM_CONDITIONAL(COND_WIN32, test x$WIN32=xyes) +AM_CONDITIONAL(COND_WIN32, test "x$WIN32" = "xyes") dnl AM_CONDITIONAL(BUILD_WIN32, test "x$enable_win32_build" = "xyes") diff --git a/lib/Makefile.am b/lib/Makefile.am index c8f72cf..d9f4688 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -20,14 +20,16 @@ libsxmp_la_LDFLAGS = libsxmp_la_LIBADD = -lpthread -lcrypto $(OPENSSL_LIBS) -if !COND_WIN32 +if COND_WIN32 libsxmp_la_LDFLAGS += -no-undefined libsxmp_la_LIBADD += -lmman -luuid /mingw64/lib/libsexpr.a /mingw64/lib/libtdata.a else + libsxmp_la_LIBADD += $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(LIBUUID_LIBS) -endif COND_WIN32 + +endif !COND_WIN32 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libsxmp.pc