commit 53a6a5a53c7a2ba98e40a65f54680bff5338cae4
parent f5fdc11d409425988a1041c3c5ef5c4b0ff72c2b
Author: Andrej Kacian <ticho@claws-mail.org>
Date: Thu, 18 Aug 2016 20:39:30 +0200
Set correct LDFLAGS for OS X.
Commit also simplifies LDFLAGS for Windows,
moving them from src/Makefile.am to configure.ac.
Closes bug #3665.
Diffstat:
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -110,18 +110,25 @@ dnl ******************************
dnl AC_CANONICAL_HOST
dnl Copied from the official gtk+-2 configure.in
-AC_MSG_CHECKING([for some Win32 platform])
+AC_MSG_CHECKING([for host platform])
case "$host" in
*-*-mingw*|*-*-cygwin*)
platform_win32=yes
- LDFLAGS="$LDFLAGS -mwindows"
+ LDFLAGS="$LDFLAGS -mwindows -Wl,--export-all-symbols"
;;
+ *-apple-*)
+ platform_osx=yes
+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+ ;;
*)
platform_win32=no
+ platform_osx=no
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
;;
esac
-AC_MSG_RESULT([$platform_win32])
AM_CONDITIONAL(PLATFORM_WIN32, test x"$platform_win32" = x"yes")
+AM_CONDITIONAL(PLATFORM_OSX, test x"$platform_osx" = x"yes")
+AC_MSG_RESULT([$host])
AC_MSG_CHECKING([for native Win32])
case "$host" in
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -546,14 +546,8 @@ IFLAGS = \
-I$(srcdir)/gtk \
-I$(srcdir)/etpan
-if PLATFORM_WIN32
-arch_ldflags := -Wl,--export-all-symbols
-else
-arch_ldflags := -Wl,--export-dynamic
-endif
-
claws_mail_LDFLAGS = \
- $(arch_ldflags) $(claws_mail_res_ldflag)
+ $(claws_mail_res_ldflag)
claws_mail_DEPENDENCIES = $(claws_mail_deps) \
$(etpan_library) \
