From 8b55e4f97093aa19ea4ce4b868009e37c0293135 Mon Sep 17 00:00:00 2001 From: Andrej Kacian Date: Sat, 26 Aug 2017 10:00:07 +0200 Subject: [PATCH] Fixed incorrect PERL_LDFLAGS modification with sed. Patch by Orbea, Bug 3866 - slibtool causes compile failure --- AUTHORS | 1 + configure.ac | 8 ++++---- src/gtk/authors.h | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index a387e3f48..bc4c8dbed 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 682e71dbe..0a997ee61 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 7f8c09c09..b6b7cf700 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", -- 2.25.1