[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: kdelibs/kinit
From:       Lubos Lunak <l.lunak () suse ! cz>
Date:       2004-09-22 14:12:52
Message-ID: 200409221612.52071.l.lunak () suse ! cz
[Download RAW message or body]

On Monday 20 of September 2004 22:55, George Staikos wrote:
> CVS commit by staikos:
>
> Make it compile for people without FontConfig.  Perhaps not the cleanest
> approach however.  Lubos?

 Hmm ... I guess it's ok. Hacks don't require the cleanest aproaches.

>
>
>   M +3 -0      configure.in.in   1.5
>   M +5 -5      kinit.cpp   1.142
>
>
> --- kdelibs/kinit/configure.in.in  #1.4:1.5
> @@ -40,3 +40,6 @@
>      AC_DEFINE(KDEINIT_USE_XFT,1,[Use Xft preinitialization in kdeinit])
>  fi
> +if test -n "$KDEINIT_FONTCONFIG"; then
> +    AC_DEFINE(KDEINIT_USE_FONTCONFIG,1,[Use FontConfig in kdeinit])
> +fi
>  AC_SUBST(KDEINIT_XFT_INCLUDES)
>
> --- kdelibs/kinit/kinit.cpp  #1.141:1.142
> @@ -90,5 +90,5 @@
>  #endif
>
> -#ifdef KDEINIT_USE_XFT
> +#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG)
>  #include <X11/Xft/Xft.h>
>  extern "C" FcBool XftInitFtLibrary (void);
> @@ -1325,5 +1325,5 @@ static void handle_requests(pid_t waitFo
>           if (sock >= 0)
>           {
> -#ifdef KDEINIT_USE_XFT
> +#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG)
>              if( !FcConfigUptoDate(NULL))
>                 FcInitReinitialize();
> @@ -1345,5 +1345,5 @@ static void handle_requests(pid_t waitFo
>           if (sock >= 0)
>           {
> -#ifdef KDEINIT_USE_XFT
> +#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG)
>              if( !FcConfigUptoDate(NULL))
>                 FcInitReinitialize();
> @@ -1760,5 +1760,5 @@ int main(int argc, char **argv, char **e
>
>     {
> -#ifdef KDEINIT_USE_XFT
> +#if defined(KDEINIT_USE_XFT) && defined(KDEINIT_USE_FONTCONFIG)
>        XftInit(0);
>        XftInitFtLibrary();

-- 
Lubos Lunak
KDE developer
---------------------------------------------------------------------
SuSE CR, s.r.o.  e-mail: l.lunak@suse.cz , l.lunak@kde.org
Drahobejlova 27  tel: +420 2 9654 2373
190 00 Praha 9   fax: +420 2 9654 2374
Czech Republic   http://www.suse.cz/
[prev in list] [next in list] [prev in thread] [next in thread]