aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-03-30 12:43:38 (GMT)
committerfluxgen <fluxgen>2003-03-30 12:43:38 (GMT)
commit8a6d0e6ed837d78995c5ee80c703b5bdf180fe10 (patch)
treeb3adcc07dbefc314d12bfe59bc480d536d593a5d
parentfdf611064ed965d308e275f188fe2a626c7f21a9 (diff)
downloadfluxbox_paul-8a6d0e6ed837d78995c5ee80c703b5bdf180fe10.zip
fluxbox_paul-8a6d0e6ed837d78995c5ee80c703b5bdf180fe10.tar.bz2
using pkg-config instead of xft-config
-rw-r--r--xft.m424
1 files changed, 12 insertions, 12 deletions
diff --git a/xft.m4 b/xft.m4
index ee6b5da..4a92cb0 100644
--- a/xft.m4
+++ b/xft.m4
@@ -32,26 +32,26 @@ AC_DEFUN(AM_PATH_XFT1,
32# AM_PATH_XFT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) 32# AM_PATH_XFT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
33AC_DEFUN(AM_PATH_XFT2, 33AC_DEFUN(AM_PATH_XFT2,
34[ 34[
35if test x$xft_exec_prefix != x ; then 35 if test x$pkg_exec_prefix != x ; then
36 xft_args="$xft_args --exec-prefix=$xft_exec_prefix" 36 xft_args="$xft_args --exec-prefix=$pkg_exec_prefix"
37 if test x${XFT_CONFIG+set} != xset ; then 37 if test x${PKG_CONFIG+set} != xset ; then
38 XFT_CONFIG=$xft_exec_prefix/bin/xft-config 38 PKG_CONFIG=$pkg_exec_prefix/bin/pkg-config
39 fi 39 fi
40fi 40fi
41 41
42if test x$xft_prefix != x ; then 42if test x$xft_prefix != x ; then
43 xft_args="$xft_args --prefix=$xft_prefix" 43 xft_args="$xft_args --prefix=$xft_prefix"
44 if test x${XFT_CONFIG+set} != xset ; then 44 if test x${PKG_CONFIG+set} != xset ; then
45 XFT_CONFIG=$xft_prefix/bin/xft-config 45 PKG_CONFIG=$xft_prefix/bin/pkg-config
46 fi 46 fi
47fi 47fi
48 48
49AC_PATH_PROG(XFT_CONFIG, xft-config, no) 49AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
50if test "x$XFT_CONFIG" = "xno" ; then 50if test "x$PKG_CONFIG" = "xno" ; then
51 ifelse([$2], , :, [$2]) 51 ifelse([$2], , :, [$2])
52else 52else
53 XFT_CFLAGS=`$XFT_CONFIG $xftconf_args --cflags` 53 XFT_CFLAGS=`$PKG_CONFIG $xftconf_args --cflags xft`
54 XFT_LIBS=`$XFT_CONFIG $xftconf_args --libs` 54 XFT_LIBS=`$PKG_CONFIG $xftconf_args --libs xft`
55 ifelse([$1], , :, [$1]) 55 ifelse([$1], , :, [$1])
56fi 56fi
57 57
@@ -63,8 +63,8 @@ AC_DEFUN(AM_PATH_XFT,
63[ 63[
64 AC_ARG_WITH(xft-prefix,[ --with-xft-prefix=path Prefix where Xft is installed (optional)], 64 AC_ARG_WITH(xft-prefix,[ --with-xft-prefix=path Prefix where Xft is installed (optional)],
65 xft_prefix="$withval", xft_prefix="") 65 xft_prefix="$withval", xft_prefix="")
66 AC_ARG_WITH(xft-exec-prefix,[ --with-xft-exec-prefix=path Exec prefix where xft-config is installed (optional)], 66 AC_ARG_WITH(pkg-exec-prefix,[ --with-pkg-exec-prefix=path Exec prefix where pkg-config is installed (optional)],
67 xft_exec_prefix="$withval", xft_exec_prefix="") 67 pkg_exec_prefix="$withval", pkg_exec_prefix="")
68 AC_ARG_ENABLE(xft, [ --enable-xft Xft (antialias) support (default=$1)], 68 AC_ARG_ENABLE(xft, [ --enable-xft Xft (antialias) support (default=$1)],
69 if test "x$enableval" = "xyes"; then 69 if test "x$enableval" = "xyes"; then
70 TRY_XFT=yes 70 TRY_XFT=yes