[SCM] plotmm/master: Set libplotmm_la_{LIBADD, LDFLAGS} properly. Try to link with -Wl, --as-needed.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit af3df396711e16af70bd86527d34e6694cc32867
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 22 17:16:43 2010 +0200

    Set libplotmm_la_{LIBADD,LDFLAGS} properly. Try to link with -Wl,--as-needed.

diff --git a/debian/patches/02-buildsystem.patch b/debian/patches/02-buildsystem.patch
index 73bf23b..657bf10 100644
--- a/debian/patches/02-buildsystem.patch
+++ b/debian/patches/02-buildsystem.patch
@@ -1,9 +1,9 @@
 Description: Adjust buildsystem to link against all needed libraries.
 Author: Alessio Treglia <alessio at debian.org>
 ---
- configure.ac       |    2 --
- plotmm/Makefile.am |    1 +
- 2 files changed, 1 insertion(+), 2 deletions(-)
+ configure.ac       |   14 ++++++++++++--
+ plotmm/Makefile.am |    3 +++
+ 2 files changed, 15 insertions(+), 2 deletions(-)
 
 --- plotmm.orig/configure.ac
 +++ plotmm/configure.ac
@@ -23,12 +23,33 @@ Author: Alessio Treglia <alessio at debian.org>
  AM_PROG_LIBTOOL
  
  AC_CHECK_TOOL(DOXYGEN, doxygen)
+@@ -25,6 +23,18 @@ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+ AC_SUBST(GTKMM_PC)
+ 
++AC_MSG_CHECKING([if -Wl,--as-needed works])
++LFDLAGS_save=$LDFLAGS
++LDFLAGS="$LDFLAGS -Wl,--as-needed"
++AC_TRY_LINK([], [],
++            [
++             AC_MSG_RESULT([yes])
++             PACKAGE_LDFLAGS="$PACKAGE_LDFLAGS -Wl,--as-needed"
++            ],
++            [AC_MSG_RESULT([no])])
++LDFLAGS=$LDFLAGS_save
++AC_SUBST(PACKAGE_LDFLAGS)
++
+ AC_OUTPUT([
+ Makefile
+ Doxyfile
 --- plotmm.orig/plotmm/Makefile.am
 +++ plotmm/plotmm/Makefile.am
-@@ -15,5 +15,6 @@ libplotmm_la_SOURCES = \
+@@ -15,5 +15,8 @@ libplotmm_la_SOURCES = \
  	compat.h
  
  libplotmm_la_CXXFLAGS = @PACKAGE_CFLAGS@ -I$(top_srcdir)
-+libplotmm_la_LIBADD = -lglib-2.0 -lglibmm-2.4 -lgtkmm-2.4 -lgdkmm-2.4 -lpangomm-1.4 -lsigc-2.0 -latkmm-1.6
++#libplotmm_la_LIBADD = -lglib-2.0 -lglibmm-2.4 -lgtkmm-2.4 -lgdkmm-2.4 -lpangomm-1.4 -lsigc-2.0 -latkmm-1.6
++libplotmm_la_LIBADD = @PACKAGE_LIBS@
++libplotmm_la_LDFLAGS = @PACKAGE_LDFLAGS@
  
  CLEANFILES = *~

-- 
plotmm packaging