[cups.development] Re: [cups.commit] [ESP Ghostscript] r147 - in trunk: . src

Michael Sweet mike at easysw.com
Tue May 2 08:38:20 PDT 2006


cups-dev at easysw.com wrote:
> Author: bero
> Date: 2006-05-02 10:47:10 -0400 (Tue, 02 May 2006)
> New Revision: 147
> 
> Modified:
>    trunk/CHANGES
>    trunk/src/fapi_ft.c
>    trunk/src/int.mak
> Log:
> Allow using system freetype
> ...
> Modified: trunk/src/fapi_ft.c
> ===================================================================
> --- trunk/src/fapi_ft.c	2006-05-02 13:22:28 UTC (rev 146)
> +++ trunk/src/fapi_ft.c	2006-05-02 14:47:10 UTC (rev 147)
> @@ -30,11 +30,12 @@
>  #include "math_.h"
>  
>  /* FreeType headers */
> -#include "freetype/freetype.h"
> -#include "freetype/ftincrem.h"
> -#include "freetype/ftglyph.h"
> -#include "freetype/ftoutln.h"
> -#include "freetype/fttrigon.h"
> +#include <ft2build.h>
> +#include FT_FREETYPE_H 
> +#include FT_INCREMENTAL_H
> +#include FT_GLYPH_H
> +#include FT_OUTLINE_H
> +#include FT_TRIGONOMETRY_H

AFAIK, macro expansion for #include's is not portable...

>  #include <stdlib.h>
>  #include <assert.h>
> 
> Modified: trunk/src/int.mak
> ===================================================================
> --- trunk/src/int.mak	2006-05-02 13:22:28 UTC (rev 146)
> +++ trunk/src/int.mak	2006-05-02 14:47:10 UTC (rev 147)
> @@ -1872,29 +1872,39 @@
>  
>  # FreeType bridge :
>  
> +ifdef FT_ROOT
>  FT_LIB=$(FT_ROOT)$(D)objs$(D)freetype214MT_D
>  FT_INC=$(I_)$(FT_ROOT)$(D)include$(_I)
> +FT_LINK=-link $(FT_LIB)$(FT_LIB_EXT)
> +FT_DEPS=$(FT_LIB)$(FT_LIB_EXT)
> +FT_HDEPS=$(FT_ROOT)$(D)include$(D)freetype$(D)freetype.h\
> + $(FT_ROOT)$(D)include$(D)freetype$(D)ftincrem.h\
> + $(FT_ROOT)$(D)include$(D)freetype$(D)ftglyph.h\
> + $(FT_ROOT)$(D)include$(D)freetype$(D)ftoutln.h\
> + $(FT_ROOT)$(D)include$(D)freetype$(D)fttrigon.h
> +else
> +FT_LIB=freetype
> +FT_LINK=-lib $(FT_LIB)
> +FT_DEPS=
> +FT_HDEPS=
> +endif

ifdef stuff in makefiles is not portable...

Bero, please read the CUPS Developer Guide, and then write the
appropriate autoconf tests/options instead!

-- 
______________________________________________________________________
Michael Sweet, Easy Software Products           mike at easysw dot com
Internet Printing and Document Software          http://www.easysw.com





More information about the cups mailing list