aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2011-01-23 20:45:19 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2011-01-23 20:45:19 (GMT)
commite38994ae727a3bc7fa77f45d5bdbb97dffcbd1e5 (patch)
tree879c1534b981157807af1855b48deb177b09315a
parente868ff5928af2badd1418006b4a46889fea3eb57 (diff)
downloadfluxbox_pavel-e38994ae727a3bc7fa77f45d5bdbb97dffcbd1e5.zip
fluxbox_pavel-e38994ae727a3bc7fa77f45d5bdbb97dffcbd1e5.tar.bz2
build fix: use 'xft-config' instead of 'pkg-config' to use the right libs
when linking with binutils-gold and --no-add-needed it is not enough to just use -lXft but it must be -lXft -fontconfig (and some more). since we use 'pkg-config --libs' to find out about the needed flags and 'pkg-config' only returns -lXft (except by using pkg-config --libs `pkg-config --print-requires-private xft` ) we switched to 'xft-config --libs' which gives us the complete list of all needed libs. the issue was brought to attention by http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554386 but the proposed fix was just quick and dirty.
-rw-r--r--acinclude.m440
1 files changed, 20 insertions, 20 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index a181dba..0b53558 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -168,28 +168,28 @@ AC_DEFUN([AM_PATH_XFT1],
168# AM_PATH_XFT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) 168# AM_PATH_XFT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
169AC_DEFUN([AM_PATH_XFT2], 169AC_DEFUN([AM_PATH_XFT2],
170[ 170[
171 if test x$pkg_exec_prefix != x ; then 171 if test x$pkg_exec_prefix != x ; then
172 xft_args="$xft_args --exec-prefix=$pkg_exec_prefix" 172 xft_args="$xft_args --exec-prefix=$pkg_exec_prefix"
173 if test x${PKG_CONFIG+set} != xset ; then 173 if test x${XFT_CONFIG+set} != xset ; then
174 PKG_CONFIG=$pkg_exec_prefix/bin/pkg-config 174 XFT_CONFIG=$pkg_exec_prefix/bin/xft-config
175 fi
175 fi 176 fi
176fi
177 177
178if test x$xft_prefix != x ; then 178 if test x$xft_prefix != x ; then
179 xft_args="$xft_args --prefix=$xft_prefix" 179 xft_args="$xft_args --prefix=$xft_prefix"
180 if test x${PKG_CONFIG+set} != xset ; then 180 if test x${XFT_CONFIG+set} != xset ; then
181 PKG_CONFIG=$xft_prefix/bin/pkg-config 181 XFT_CONFIG=$xft_prefix/bin/xft-config
182 fi 182 fi
183fi 183 fi
184 184
185AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 185 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
186if test "x$PKG_CONFIG" = "xno" ; then 186 if test "x$XFT_CONFIG" = "xno" ; then
187 ifelse([$2], , :, [$2]) 187 ifelse([$2], , :, [$2])
188else 188 else
189 XFT_CFLAGS=`$PKG_CONFIG $xftconf_args --cflags xft` 189 XFT_CFLAGS=`$XFT_CONFIG $xftconf_args --cflags`
190 XFT_LIBS=`$PKG_CONFIG $xftconf_args --libs xft` 190 XFT_LIBS=`$XFT_CONFIG $xftconf_args --libs`
191 ifelse([$1], , :, [$1]) 191 ifelse([$1], , :, [$1])
192fi 192 fi
193 193
194]) 194])
195 195
@@ -230,4 +230,4 @@ CFLAGS="$CFLAGS $XFT_CFLAGS"
230CXXFLAGS="$CXXFLAGS $XFT_CFLAGS" 230CXXFLAGS="$CXXFLAGS $XFT_CFLAGS"
231LIBS="$LIBS $XFT_LIBS" 231LIBS="$LIBS $XFT_LIBS"
232 232
233]) 233]