[Commits] [SCM] claws branch, master, updated. 3.14.0-14-gc9c7295

[ticho at claws-mail.org]

The branch, master has been updated
       via  c9c7295006daf90a3860305a3a6836c99bfcde11 (commit)
       via  53a6a5a53c7a2ba98e40a65f54680bff5338cae4 (commit)
      from  f5fdc11d409425988a1041c3c5ef5c4b0ff72c2b (commit)

Summary of changes:
 configure.ac        |   13 ++++++++++---
 src/Makefile.am     |    8 +-------
 src/common/w32lib.h |    1 -
 3 files changed, 11 insertions(+), 11 deletions(-)


- Log -----------------------------------------------------------------
commit c9c7295006daf90a3860305a3a6836c99bfcde11
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Aug 18 23:40:16 2016 +0200

    Removed fork() prototype from w32lib.h.
    
    fork() is builtin in mingw.

diff --git a/src/common/w32lib.h b/src/common/w32lib.h
index cfa8e53..26e2c8a 100644
--- a/src/common/w32lib.h
+++ b/src/common/w32lib.h
@@ -194,7 +194,6 @@ int gettimeofday( struct timeval *tv, struct timezone *tz );
 /*** unistd ***/
 int setpgid( pid_t pid, pid_t pgid );
 pid_t getppid( void );
-pid_t fork( void );
 unsigned int sleep( unsigned int seconds );
 
 /*** stdlib ***/

commit 53a6a5a53c7a2ba98e40a65f54680bff5338cae4
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Aug 18 20:39:30 2016 +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.

diff --git a/configure.ac b/configure.ac
index 78fc268..5965357 100644
--- 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
index b840f34..d2f9955 100644
--- 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) \

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail