Signed-off-by: Alan Coopersmith <[email protected]>
---
configure.ac | 37 +++++++++++++++++++++++++++++--------
1 file changed, 29 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 89b34ce..4edad6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,11 +67,17 @@ XFONT_FONTFILE=no
# FreeType for all scalable (OpenType, TrueType, PostScript) and
# some bitmap formats (BDF & PCF)
#
-AC_ARG_ENABLE(freetype, [
--disable-freetype],[XFONT_FREETYPE=$enableval],[XFONT_FREETYPE=yes])
+AC_ARG_ENABLE(freetype,
+ AS_HELP_STRING([--disable-freetype],
+ [Build freetype backend (default: enabled)]),
+ [XFONT_FREETYPE=$enableval],[XFONT_FREETYPE=yes])
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)
+ AC_ARG_WITH(freetype-config,
+ AS_HELP_STRING([--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,
@@ -117,7 +123,7 @@ AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz], AC_MSG_ERROR([***
zlib is required]))
AC_ARG_WITH(bzip2,
AS_HELP_STRING([--with-bzip2],
- [Support bzip2 compressed bitmap fonts]),
+ [Use libbz2 to support bzip2 compressed bitmap fonts (default: no)]),
[], [with_bzip2=no])
if test "x$with_bzip2" = xyes; then
AC_CHECK_LIB(bz2, BZ2_bzopen, [Z_LIBS="$Z_LIBS -lbz2"],
@@ -127,28 +133,40 @@ fi
AM_CONDITIONAL(X_BZIP2_FONT_COMPRESSION, [test "x$with_bzip2" = xyes ])
AC_SUBST(Z_LIBS)
-AC_ARG_ENABLE(builtins, [ --disable-builtins ], [XFONT_BUILTINS=$enableval],
[XFONT_BUILTINS=yes])
+AC_ARG_ENABLE(builtins,
+ AS_HELP_STRING([--disable-builtins],
+ [Support builtin fonts (default: enabled)]),
+ [XFONT_BUILTINS=$enableval], [XFONT_BUILTINS=yes])
AM_CONDITIONAL(XFONT_BUILTINS, [test "x$XFONT_BUILTINS" = xyes ])
if test "x$XFONT_BUILTINS" = xyes; then
AC_DEFINE(XFONT_BUILTINS,1,[Support built-in fonts])
XFONT_BITMAP=yes
fi
-AC_ARG_ENABLE(pcfformat, [ --disable-pcfformat ],
[XFONT_PCFFORMAT=$enableval], [XFONT_PCFFORMAT=yes])
+AC_ARG_ENABLE(pcfformat,
+ AS_HELP_STRING([--disable-pcfformat],
+ [Support PCF format bitmap fonts (default: enabled)]),
+ [XFONT_PCFFORMAT=$enableval], [XFONT_PCFFORMAT=yes])
AM_CONDITIONAL(XFONT_PCFFORMAT, [test "x$XFONT_PCFFORMAT" = xyes])
if test "x$XFONT_PCFFORMAT" = xyes; then
AC_DEFINE(XFONT_PCFFORMAT,1,[Support pcf format bitmap font files])
XFONT_BITMAP=yes
fi
-AC_ARG_ENABLE(bdfformat, [ --disable-bdfformat ],
[XFONT_BDFFORMAT=$enableval], [XFONT_BDFFORMAT=yes])
+AC_ARG_ENABLE(bdfformat,
+ AS_HELP_STRING([--disable-bdfformat],
+ [Support BDF format bitmap fonts (default: enabled)]),
+ [XFONT_BDFFORMAT=$enableval], [XFONT_BDFFORMAT=yes])
AM_CONDITIONAL(XFONT_BDFFORMAT, [test "x$XFONT_BDFFORMAT" = xyes])
if test "x$XFONT_BDFFORMAT" = xyes; then
AC_DEFINE(XFONT_BDFFORMAT,1,[Support bdf format bitmap font files])
XFONT_BITMAP=yes
fi
-AC_ARG_ENABLE(snfformat, [ --disable-snfformat ],
[XFONT_SNFFORMAT=$enableval], [XFONT_SNFFORMAT=yes])
+AC_ARG_ENABLE(snfformat,
+ AS_HELP_STRING([--disable-snfformat],
+ [Support SNF format bitmap fonts (default: enabled)]),
+ [XFONT_SNFFORMAT=$enableval], [XFONT_SNFFORMAT=yes])
AM_CONDITIONAL(XFONT_SNFFORMAT, [test "x$XFONT_SNFFORMAT" = xyes])
if test "x$XFONT_SNFFORMAT" = xyes; then
AC_DEFINE(XFONT_SNFFORMAT,1,[Support snf format bitmap font files])
@@ -170,7 +188,10 @@ fi
# Support connection to font servers?
#
-AC_ARG_ENABLE(fc, [ --disable-fc ],[XFONT_FC=$enableval],[XFONT_FC=yes])
+AC_ARG_ENABLE(fc,
+ AS_HELP_STRING([--disable-fc],
+ [Support connections to xfs servers (default: enabled)]),
+ [XFONT_FC=$enableval],[XFONT_FC=yes])
AM_CONDITIONAL(XFONT_FC, [test "x$XFONT_FC" = xyes])
if test "x$XFONT_FC" = xyes; then
AC_DEFINE(XFONT_FC,1,[Support the X Font Services Protocol])
--
1.7.9.2
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
