Attachment #414054 for bug #562302




dnl =================================
dnl Checking for freetype2
dnl =================================
dnl "freetype2 >= 17" means freetype-2.5.1
PKG_CHECK_MODULES(FREETYPE, freetype2 >= 17, ,
	[PKG_CHECK_MODULES(FREETYPE, freetype2, [FREETYPE_CFLAGS="$FREETYPE_CFLAGS -I`$PKG_CONFIG --variable=includedir freetype2`/freetype2/freetype"])])
if test "x$FREETYPE_CONFIG" = "xno" ; then
	AC_MSG_ERROR(You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint)
else
	FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
	FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
fi

libgnomeprint_save_ldflags=$LDFLAGS
LDFLAGS="$LDFLAGS $FREETYPE_LIBS"

freetype_version=false
AC_MSG_NOTICE([checking for sufficiently new FreeType (at least 2.0.5)])
AC_CHECK_LIB(freetype, FT_Get_Postscript_Name,:,[
    AC_MSG_ERROR(You need FreeType2 (freetype-devel 2.0.5 or greater package) for this version of libgnomeprint)])

LDFLAGS=$libgnomeprint_save_ldflags

dnl =================================
dnl END: Checking for freetype2

Lines 36-42 Link Here

(-)a/libgnomeprint/gnome-font-face.c (-1 / +2 lines)
36	#include <stdarg.h>	36	#include <stdarg.h>
37	#include <locale.h>	37	#include <locale.h>
38		38
39	#include <freetype/ftoutln.h>	39	#include <ft2build.h>
		40	#include FT_OUTLINE_H
40		41
41	#include <libgnomeprint/gnome-print-private.h>	42	#include <libgnomeprint/gnome-print-private.h>
42	#include <libgnomeprint/gnome-font-private.h>	43	#include <libgnomeprint/gnome-font-private.h>

Lines 36-42 Link Here

(-)a/libgnomeprint/gnome-print-gdi.c (-1 / +1 lines)
36	#include <libgnomeprint/gp-gc-private.h>	36	#include <libgnomeprint/gp-gc-private.h>
37		37
38	#include <ft2build.h>	38	#include <ft2build.h>
39	#include <freetype/freetype.h>	39	#include FT_FREETYPE_H
40		40
41	#define WIN32_LEAN_AND_MEAN	41	#define WIN32_LEAN_AND_MEAN
42	#include <windows.h>	42	#include <windows.h>

Lines 28-35 Link Here

(-)a/libgnomeprint/gnome-rfont.c (-3 / +2 lines)
28		28
29	#include <ft2build.h>	29	#include <ft2build.h>
30	#include FT_FREETYPE_H	30	#include FT_FREETYPE_H
31	#include <freetype/ftglyph.h>	31	#include FT_GLYPH_H
32	#include <freetype/ftbbox.h>	32	#include FT_BBOX_H
33	#include <libart_lgpl/art_misc.h>	33	#include <libart_lgpl/art_misc.h>
34	#include <libart_lgpl/art_affine.h>	34	#include <libart_lgpl/art_affine.h>
35	#include <libart_lgpl/art_vpath.h>	35	#include <libart_lgpl/art_vpath.h>
36	-

Return to bug 562302

Lines 162-186 LDFLAGS="$LDFLAGS $LIBM" Link Here

(-)a/configure.in (-19 / +3 lines)
162	dnl =================================	162	dnl =================================
163	dnl Checking for freetype2	163	dnl Checking for freetype2
164	dnl =================================	164	dnl =================================
165	FREETYPE_LIBS=	165	dnl "freetype2 >= 17" means freetype-2.5.1
166	FREETYPE_CFLAGS=	166	PKG_CHECK_MODULES(FREETYPE, freetype2 >= 17, ,
167	AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)	167	[PKG_CHECK_MODULES(FREETYPE, freetype2, [FREETYPE_CFLAGS="$FREETYPE_CFLAGS -I`$PKG_CONFIG --variable=includedir freetype2`/freetype2/freetype"])])
168	if test "x$FREETYPE_CONFIG" = "xno" ; then
169	AC_MSG_ERROR(You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint)
170	else
171	FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
172	FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
173	fi
174
175	libgnomeprint_save_ldflags=$LDFLAGS
176	LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
177
178	freetype_version=false
179	AC_MSG_NOTICE([checking for sufficiently new FreeType (at least 2.0.5)])
180	AC_CHECK_LIB(freetype, FT_Get_Postscript_Name,:,[
181	AC_MSG_ERROR(You need FreeType2 (freetype-devel 2.0.5 or greater package) for this version of libgnomeprint)])
182
183	LDFLAGS=$libgnomeprint_save_ldflags
184		168
185	dnl =================================	169	dnl =================================
186	dnl END: Checking for freetype2	170	dnl END: Checking for freetype2