diff options
-rw-r--r-- | acinclude.m4 | 68 |
1 files changed, 33 insertions, 35 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 0b53558..aad7dc8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 | |||
@@ -185,49 +185,47 @@ AC_DEFUN([AM_PATH_XFT2], | |||
185 | AC_PATH_PROG(XFT_CONFIG, xft-config, no) | 185 | AC_PATH_PROG(XFT_CONFIG, xft-config, no) |
186 | if test "x$XFT_CONFIG" = "xno" ; then | 186 | if test "x$XFT_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=`$XFT_CONFIG $xftconf_args --cflags` |
190 | XFT_LIBS=`$XFT_CONFIG $xftconf_args --libs` | 190 | XFT_LIBS=`$XFT_CONFIG $xftconf_args --libs` |
191 | ifelse([$1], , :, [$1]) | 191 | ifelse([$1], , :, [$1]) |
192 | fi | 192 | fi |
193 | |||
194 | ]) | 193 | ]) |
195 | 194 | ||
196 | # AM_PATH_XFT(default-value, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | 195 | # AM_PATH_XFT(default-value, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) |
197 | # Test for Xft, and define XFT_CFLAGS and XFT_LIBS | 196 | # Test for Xft, and define XFT_CFLAGS and XFT_LIBS |
198 | AC_DEFUN([AM_PATH_XFT], | 197 | AC_DEFUN([AM_PATH_XFT], |
199 | [ | 198 | [ |
200 | AC_ARG_WITH(xft-prefix,[ --with-xft-prefix=path Prefix where Xft is installed (optional)], | 199 | AC_ARG_WITH(xft-prefix,[ --with-xft-prefix=path Prefix where Xft is installed (optional)], |
201 | xft_prefix="$withval", xft_prefix="") | 200 | xft_prefix="$withval", xft_prefix="") |
202 | AC_ARG_WITH(pkg-exec-prefix,[ --with-pkg-exec-prefix=path Exec prefix where pkg-config is installed (optional)], | 201 | AC_ARG_WITH(pkg-exec-prefix,[ --with-pkg-exec-prefix=path Exec prefix where pkg-config is installed (optional)], |
203 | pkg_exec_prefix="$withval", pkg_exec_prefix="") | 202 | pkg_exec_prefix="$withval", pkg_exec_prefix="") |
204 | AC_ARG_ENABLE(xft, [ --enable-xft Xft (antialias) support (default=$1)], | 203 | AC_ARG_ENABLE(xft, [ --enable-xft Xft (antialias) support (default=$1)], |
205 | if test "x$enableval" = "xyes"; then | 204 | if test "x$enableval" = "xyes"; then |
206 | TRY_XFT=yes | 205 | TRY_XFT=yes |
207 | else | 206 | else |
208 | TRY_XFT=no | 207 | TRY_XFT=no |
209 | fi | 208 | fi |
210 | , | 209 | , |
211 | TRY_XFT=$1 | 210 | TRY_XFT=$1 |
212 | ) | 211 | ) |
213 | 212 | ||
214 | if test "x$TRY_XFT" = "xyes"; then | 213 | if test "x$TRY_XFT" = "xyes"; then |
215 | AC_MSG_RESULT(yes) | 214 | AC_MSG_RESULT(yes) |
216 | AM_PATH_XFT2( | 215 | AM_PATH_XFT2( |
217 | [$2], | 216 | [$2], |
218 | # xft2 failed: try xft1 | 217 | # xft2 failed: try xft1 |
219 | AM_PATH_XFT1( | 218 | AM_PATH_XFT1( |
220 | [$2], | 219 | [$2], |
221 | [$3] | 220 | [$3] |
222 | AC_MSG_RESULT([Cant find Xft libraries! Disabling Xft])) | 221 | AC_MSG_RESULT([Cant find Xft libraries! Disabling Xft])) |
223 | ) | 222 | ) |
224 | else | 223 | else |
225 | AC_MSG_RESULT(no) | 224 | AC_MSG_RESULT(no) |
226 | [$3] | 225 | [$3] |
227 | fi | 226 | fi |
228 | |||
229 | CFLAGS="$CFLAGS $XFT_CFLAGS" | ||
230 | CXXFLAGS="$CXXFLAGS $XFT_CFLAGS" | ||
231 | LIBS="$LIBS $XFT_LIBS" | ||
232 | 227 | ||
233 | ] | 228 | CFLAGS="$CFLAGS $XFT_CFLAGS" |
229 | CXXFLAGS="$CXXFLAGS $XFT_CFLAGS" | ||
230 | LIBS="$LIBS $XFT_LIBS" | ||
231 | ]) | ||