freetype detection take 2.
Rein Klazes
rklazes at xs4all.nl
Wed Nov 19 05:48:07 CST 2003
hi,
That was a bit too easy, this should work better.
Changelog:
. : configure.ac
Fix detection of freetype/freetype.h when the libfreetype
version requires that ft2build.h is included first.
Rein.
--
Rein Klazes
rklazes at xs4all.nl
-------------- next part --------------
--- wine/configure.ac 2003-11-19 09:16:27.000000000 +0100
+++ mywine/configure.ac 2003-11-19 12:10:47.000000000 +0100
@@ -447,15 +447,19 @@
FREETYPEINCL=`$ft_devel --cflags`
ac_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$FREETYPEINCL $CPPFLAGS"
- AC_CHECK_HEADERS(ft2build.h \
- freetype/freetype.h \
+ AC_CHECK_HEADERS(ft2build.h )
+ AC_CHECK_HEADERS( freetype/freetype.h \
freetype/ftglyph.h \
freetype/tttables.h \
freetype/ftnames.h \
freetype/ftsnames.h \
freetype/ttnameid.h \
freetype/ftoutln.h \
- freetype/internal/sfnt.h)
+ freetype/internal/sfnt.h,,,
+ [#if HAVE_FT2BUILD_H
+ #include <ft2build.h>
+ #endif
+ ])
AC_TRY_CPP([#include <ft2build.h>
#include <freetype/fttrigon.h>],
[AC_DEFINE(HAVE_FREETYPE_FTTRIGON_H, 1,
More information about the wine-patches
mailing list