diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-16 22:21:21 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-16 22:21:21 -0700 |
| commit | 098ab294deed98371ee362fadafcf2e510e0cc50 (patch) | |
| tree | 8ac9b280165a108d762f5de995782d172b7dbf75 /configure.ac | |
| parent | 211368b8d04ed13ba520de2dd49a875cb1d663a7 (diff) | |
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 1905a53..8cff1d8 100644 --- a/configure.ac +++ b/configure.ac @@ -69,13 +69,13 @@ AM_CONDITIONAL(XFONT_FREETYPE, [test x$XFONT_FREETYPE = xyes]) if test x$XFONT_FREETYPE = xyes; then AC_DEFINE(XFONT_FREETYPE,1,[Support FreeType rasterizer for nearly all font file formats]) AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=auto) - + if test "$freetype_config" = "auto" ; then - PKG_CHECK_MODULES(FREETYPE, freetype2, + PKG_CHECK_MODULES(FREETYPE, freetype2, freetype_config=no, freetype_config=yes) fi - if test "$freetype_config" = "yes"; then + if test "$freetype_config" = "yes"; then AC_PATH_PROG(ft_config,freetype-config,no) if test "$ft_config" = "no"; then AC_MSG_ERROR([You must have freetype installed; see http://www.freetype.org/]) @@ -84,7 +84,7 @@ if test x$XFONT_FREETYPE = xyes; then ft_config="$freetype_config" fi - if test "$freetype_config" != "no"; then + if test "$freetype_config" != "no"; then FREETYPE_CFLAGS="`$ft_config --cflags`" FREETYPE_LIBS="`$ft_config --libs`" fi @@ -112,8 +112,8 @@ X_GZIP_FONT_COMPRESSION=1 AC_SUBST(X_GZIP_FONT_COMPRESSION) AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz], AC_MSG_ERROR([*** zlib is required])) -AC_ARG_WITH(bzip2, - AS_HELP_STRING([--with-bzip2], +AC_ARG_WITH(bzip2, + AS_HELP_STRING([--with-bzip2], [Support bzip2 compressed bitmap fonts]), [], [with_bzip2=no]) if test "x$with_bzip2" = xyes; then |