From f65220a87ccd65e2c3991d09fc7a4a1051404512 Mon Sep 17 00:00:00 2001
From: tadam <tadam>
Date: Sun, 10 Apr 2011 18:47:18 +0000
Subject: [PATCH] ld --as-needed compilation fixes with external libs.

---
 ChangeLog    | 5 +++++
 acinclude.m4 | 2 +-
 configure.ac | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d67a6e42c..48fa7ac23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-10  Thomas Adam  <thomas@fvwm.org>
+	* acinclude.m4:
+	* configure.ac:
+	More --as-needed ld fixes for linking against exernal libraries.
+
 2011-04-05  Thomas Adam  <thomas@fvwm.org>
 	* fvwm/update.c (apply_window_updates):
 	Don't clear all States on WindowStyle.
diff --git a/acinclude.m4 b/acinclude.m4
index e5e6bcd3f..aea350684 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -943,7 +943,7 @@ if test "$FT2_CONFIG" = "no" ; then
   no_ft=yes
 else
   FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
-  FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs` -lfontconfig
+  FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
   ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
          sed 's/^[[^0-9.]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*$/\1/'`
   ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
diff --git a/configure.ac b/configure.ac
index cc79c0453..1c82f68e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -698,6 +698,10 @@ if test ! x"$with_xft" = xno; then
     AM_CHECK_FC(1.0.1)
     if test x"$no_fc" = x ; then
       have_fontconfig=yes
+      fontconfig_CFLAGS=`$PKG_CONFIG --cflags fontconfig`
+      fontconfig_LIBS=`$PKG_CONFIG --libs fontconfig`
+      CFLAGS="$CFLAGS $fontconfig_CFLAGS"
+      LIBS="$LIBS $fontconfig_LIBS"
     else
       have_fontconfig=no
       problem_xft=": Can't detect fontconfig >= 1.0.1"
-- 
2.11.4.GIT