fix missing ')' introduced by e38994ae, the rest is cosmetical
Mathias Gumz akira at fluxbox dot org
1 files changed,
32 insertions(+),
34 deletions(-)
jump to
M
acinclude.m4
→
acinclude.m4
@@ -185,49 +185,47 @@
AC_PATH_PROG(XFT_CONFIG, xft-config, no) if test "x$XFT_CONFIG" = "xno" ; then ifelse([$2], , :, [$2]) - else + else XFT_CFLAGS=`$XFT_CONFIG $xftconf_args --cflags` XFT_LIBS=`$XFT_CONFIG $xftconf_args --libs` ifelse([$1], , :, [$1]) fi - ]) # AM_PATH_XFT(default-value, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) # Test for Xft, and define XFT_CFLAGS and XFT_LIBS AC_DEFUN([AM_PATH_XFT], [ - AC_ARG_WITH(xft-prefix,[ --with-xft-prefix=path Prefix where Xft is installed (optional)], - xft_prefix="$withval", xft_prefix="") - AC_ARG_WITH(pkg-exec-prefix,[ --with-pkg-exec-prefix=path Exec prefix where pkg-config is installed (optional)], - pkg_exec_prefix="$withval", pkg_exec_prefix="") - AC_ARG_ENABLE(xft, [ --enable-xft Xft (antialias) support (default=$1)], - if test "x$enableval" = "xyes"; then - TRY_XFT=yes - else - TRY_XFT=no - fi - , - TRY_XFT=$1 - ) - -if test "x$TRY_XFT" = "xyes"; then - AC_MSG_RESULT(yes) - AM_PATH_XFT2( - [$2], - # xft2 failed: try xft1 - AM_PATH_XFT1( - [$2], - [$3] - AC_MSG_RESULT([Cant find Xft libraries! Disabling Xft])) - ) -else - AC_MSG_RESULT(no) - [$3] -fi + AC_ARG_WITH(xft-prefix,[ --with-xft-prefix=path Prefix where Xft is installed (optional)], + xft_prefix="$withval", xft_prefix="") + AC_ARG_WITH(pkg-exec-prefix,[ --with-pkg-exec-prefix=path Exec prefix where pkg-config is installed (optional)], + pkg_exec_prefix="$withval", pkg_exec_prefix="") + AC_ARG_ENABLE(xft, [ --enable-xft Xft (antialias) support (default=$1)], + if test "x$enableval" = "xyes"; then + TRY_XFT=yes + else + TRY_XFT=no + fi + , + TRY_XFT=$1 + ) -CFLAGS="$CFLAGS $XFT_CFLAGS" -CXXFLAGS="$CXXFLAGS $XFT_CFLAGS" -LIBS="$LIBS $XFT_LIBS" + if test "x$TRY_XFT" = "xyes"; then + AC_MSG_RESULT(yes) + AM_PATH_XFT2( + [$2], + # xft2 failed: try xft1 + AM_PATH_XFT1( + [$2], + [$3] + AC_MSG_RESULT([Cant find Xft libraries! Disabling Xft])) + ) + else + AC_MSG_RESULT(no) + [$3] + fi -] + CFLAGS="$CFLAGS $XFT_CFLAGS" + CXXFLAGS="$CXXFLAGS $XFT_CFLAGS" + LIBS="$LIBS $XFT_LIBS" +])