--- rxvt-unicode/autoconf/configure.in 2004/08/17 09:16:40 1.35 +++ rxvt-unicode/autoconf/configure.in 2004/08/21 05:32:00 1.36 @@ -94,6 +94,7 @@ support_combining=no support_8bitctrls=no support_iso14755=no +support_styles=no codesets= dnl# -------------------------------------------------------------------------- @@ -139,6 +140,7 @@ support_combining=yes #support_8bitctrls=yes support_iso14755=yes + support_styles=yes codesets=all fi]) @@ -160,6 +162,12 @@ support_xft=yes fi]) +AC_ARG_ENABLE(font-styles, + [ --enable-font-styles enable bold and italic support], + [if test x$enableval = xyes -o x$enableval = xno; then + support_styles=yes + fi]) + AC_ARG_ENABLE(utmp, [ --enable-utmp enable utmp (utmpx) support], [if test x$enableval = xyes -o x$enableval = xno; then @@ -1175,6 +1183,21 @@ dnl# -------------------------------------------------------------------------- dnl# now add and remove other stuff dnl# -------------------------------------------------------------------------- +if test x$support_xft = xyes; then + LIBS="$LIBS `pkg-config xft --libs`" + CFLAGS="$CFLAGS `pkg-config xft --cflags`" + CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`" + + AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) + AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) + + if test x$support_xft = xyes; then + AC_DEFINE(XFT, 1, Define to enable xft support) + fi +fi +if test x$support_styles = xyes; then + AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support) +fi if test x$support_iso14755 = xyes; then AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support) fi @@ -1338,19 +1361,6 @@ RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch) RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes) -if test x$support_xft = xyes; then - LIBS="$LIBS `pkg-config xft --libs`" - CFLAGS="$CFLAGS `pkg-config xft --cflags`" - CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`" - - AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) - AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no]) - - if test x$support_xft = xyes; then - AC_DEFINE(XFT, 1, Define to enable xft support) - fi -fi - AC_CONFIG_FILES([autoconf/Make.common \ Makefile \ doc/Makefile \