[Commits] [SCM] claws branch, master, updated. 3.15.0-128-g404c674

[ticho at claws-mail.org]

The branch, master has been updated
       via  404c674753092fe8e06f0a27da7405b30c646058 (commit)
       via  8b55e4f97093aa19ea4ce4b868009e37c0293135 (commit)
      from  667c9d3eaf0487193cc7873e6d3a63959a03d7f9 (commit)

Summary of changes:
 AUTHORS           |    1 +
 configure.ac      |   10 +++++-----
 src/gtk/authors.h |    1 +
 3 files changed, 7 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 404c674753092fe8e06f0a27da7405b30c646058
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat Aug 26 10:03:51 2017 +0200

    Fix typo around libarchive in configure.ac.
    
    Patch by Orbea, Bug 3866 - slibtool causes compile failure

diff --git a/configure.ac b/configure.ac
index 0a997ee..9e4933e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1174,7 +1174,7 @@ AC_SUBST(ARCHIVE_CFLAGS)
 AC_CHECK_LIB([archive], [archive_read_new],
 		       ARCHIVE_LIBS=-larchive
 		       HAVE_ARCHIVE=yes
-		       AC_SUBST(ARCHIVE_LIBS,ARCHIVE_CFLAGS),
+		       AC_SUBST(ARCHIVE_LIBS,$ARCHIVE_CFLAGS),
 		       HAVE_ARCHIVE=no
 		       )
 

commit 8b55e4f97093aa19ea4ce4b868009e37c0293135
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat Aug 26 10:00:07 2017 +0200

    Fixed incorrect PERL_LDFLAGS modification with sed.
    
    Patch by Orbea, Bug 3866 - slibtool causes compile failure

diff --git a/AUTHORS b/AUTHORS
index a387e3f..bc4c8db 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -313,3 +313,4 @@ contributors (in addition to the above; based on Changelog)
 	Ashish Gupta
 	Olivier Brunel
 	Michael Vilain
+	Orbea
diff --git a/configure.ac b/configure.ac
index 682e71d..0a997ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1222,10 +1222,10 @@ if test x"$HAVE_PERL" = xyes; then
 	AC_MSG_CHECKING(for Perl compile flags)
 	PERL_CFLAGS=`perl -MExtUtils::Embed -e ccopts`
 	PERL_CFLAGS=`echo $PERL_CFLAGS | sed 's/-D_FILE_OFFSET_BITS=[[0-9]]*//'`
-	PERL_LDFLAGS=`perl -MExtUtils::Embed -e ldopts |sed 's/-lgdbm//'`
-	PERL_LDFLAGS=`echo $PERL_LDFLAGS |sed 's/-ldb//'`
-	PERL_LDFLAGS=`echo $PERL_LDFLAGS |sed 's/-lndbm//'`
-	PERL_LDFLAGS=`echo $PERL_LDFLAGS |sed 's/-lc//'`
+	PERL_LDFLAGS=`perl -MExtUtils::Embed -e ldopts |sed 's/-lgdbm\>//'`
+	PERL_LDFLAGS=`echo $PERL_LDFLAGS |sed 's/-ldb\>//'`
+	PERL_LDFLAGS=`echo $PERL_LDFLAGS |sed 's/-lndbm\>//'`
+	PERL_LDFLAGS=`echo $PERL_LDFLAGS |sed 's/-lc\>//'`
 	AC_MSG_RESULT(ok)
 	AC_MSG_NOTICE([Adding perl LIBS ${PERL_CFLAGS}])
 	
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 7f8c09c..b6b7cf7 100644
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -240,6 +240,7 @@ static char *CONTRIBS_LIST[] = {
 "Miquel Oliete",
 "Paul Ollis",
 "Fredrik Olofssen",
+"Orbea",
 "Reza Pakdel",
 "Richard Palo",
 "Marcel Pol",

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


hooks/post-receive
-- 
Claws Mail