diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-03-03 02:53:41 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-03-03 02:53:41 +0000 |
| commit | 037fc862b0dd4535accf7b69a8c0112355bd04b1 (patch) | |
| tree | 768c502ef4cd3fb826d2d9466eac672fd614688a /configure.ac | |
| parent | c5b551b25a1d89a3f20599adeec6c6c6a31946e5 (diff) | |
pango is now mandatory..
lots of cleanups to the pango code, which was a very nice base to start from. thanks to whomever wrote that for us.. put some of the pango variables into the various render structs so that they don't need to be created all the time. put the pango context inside our RrInstance so that it can be properly freed at shutdown. removed xft dependencies all through the code and the build system also. who knows if this will break compiling for some poor souls. i guess we'll find out, won't we!
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index f55eb0b0..09159bb1 100644 --- a/configure.ac +++ b/configure.ac @@ -74,32 +74,9 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0]) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) -AC_ARG_ENABLE(pango, - AC_HELP_STRING( - [--disable-pango], - [disable the pango library [[default=enabled]]] - ), - [enable_pango=$enableval], - [enable_pango=yes] -) - -if test "$enable_pango" = yes; then -PKG_CHECK_MODULES([PANGO], [pango pangoxft], - [ - AC_DEFINE(USE_PANGO, [1], [Use Pango]) - AC_SUBST(PANGO_CFLAGS) - AC_SUBST(PANGO_LIBS) - pango_found=yes - ], - pango_found=no -) -else - pango_found=no -fi - -PKG_CHECK_MODULES(XFT, [xft]) -AC_SUBST(XFT_CFLAGS) -AC_SUBST(XFT_LIBS) +PKG_CHECK_MODULES(PANGO, [pango pangoxft]) +AC_SUBST(PANGO_CFLAGS) +AC_SUBST(PANGO_LIBS) PKG_CHECK_MODULES(XML, [libxml-2.0]) AC_SUBST(XML_CFLAGS) @@ -155,7 +132,6 @@ AC_OUTPUT AC_MSG_RESULT AC_MSG_RESULT([Compiling with these options: - Pango... $pango_found Startup Notification... $sn_found Session Management... $SM ]) |