aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--acinclude.m422
1 files changed, 11 insertions, 11 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index aad7dc8..ca5a789 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -170,24 +170,24 @@ AC_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${XFT_CONFIG+set} != xset ; then 173 if test x${PKG_CONFIG+set} != xset ; then
174 XFT_CONFIG=$pkg_exec_prefix/bin/xft-config 174 PKG_CONFIG=$pkg_exec_prefix/bin/pkg-config
175 fi 175 fi
176 fi 176 fi
177 177
178 if 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${XFT_CONFIG+set} != xset ; then 180 if test x${PKG_CONFIG+set} != xset ; then
181 XFT_CONFIG=$xft_prefix/bin/xft-config 181 PKG_CONFIG=$xft_prefix/bin/pkg-config
182 fi 182 fi
183 fi 183 fi
184 184
185 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 185 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
186 if test "x$XFT_CONFIG" = "xno" ; then 186 if test "x$PKG_CONFIG" = "xno" ; then
187 ifelse([$2], , :, [$2]) 187 ifelse([$2], , :, [$2])
188 else 188 else
189 XFT_CFLAGS=`$XFT_CONFIG $xftconf_args --cflags` 189 XFT_CFLAGS=`$PKG_CONFIG $xftconf_args --cflags xft fontconfig`
190 XFT_LIBS=`$XFT_CONFIG $xftconf_args --libs` 190 XFT_LIBS=`$PKG_CONFIG $xftconf_args --libs xft fontconfig`
191 ifelse([$1], , :, [$1]) 191 ifelse([$1], , :, [$1])
192 fi 192 fi
193]) 193])