From 1fc2fe4e023429a1a686d8aeefee294f11ba9ebd Mon Sep 17 00:00:00 2001 From: atmosphere Date: Mon, 6 May 2002 17:04:52 +0000 Subject: [PATCH] Patch from vac to fix compilation under freebsd by bringing configure.ac upto speed with configure.in SVN revision: 6211 --- legacy/evas/configure.ac | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac index 4435f1588a..b6d68d0607 100644 --- a/legacy/evas/configure.ac +++ b/legacy/evas/configure.ac @@ -130,11 +130,15 @@ AC_MSG_ERROR([Fatal Error: no FreeType detected.]) ], $LIBS_TTF -lm) -AC_CHECK_HEADERS(freetype.h freetype/freetype.h, [ break ], ) +AC_CHECK_HEADERS(freetype.h freetype/freetype.h freetype1/freetype/freetype.h,[ break] , ) AC_CHECK_HEADER(freetype.h, [ ftype=yes ], [ ftype=no ]) AC_CHECK_HEADER(freetype/freetype.h, [ ftype_ftype=yes ], [ ftype_ftype=no ]) +AC_CHECK_HEADER(freetype1/freetype/freetype.h, [ ftype1_ftype=yes ], [ ftype1_ftype=no ]) + if test x$ftype = xno; then if test x$ftype_ftype = xno; then +if test x$ftype1_ftype = xno; then + echo "" echo "ERROR: freetype.h not found in freetype.h or freetype/freetype.h include" echo "paths. (ie /usr/include, /usr/local/include etc.). You need the freetype" @@ -153,7 +157,7 @@ echo "" AC_MSG_ERROR([Fatal Error: no FreeType header files detected.]) fi fi - +fi ttf_includes="$CPPFLAGS" ttf_libs="$LIBS_TTF -lm -lttf"