diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in index dcd76cab57..e30be74b47 100644 --- a/legacy/evas/configure.in +++ b/legacy/evas/configure.in @@ -134,11 +134,13 @@ 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" @@ -157,6 +159,7 @@ echo "" AC_MSG_ERROR([Fatal Error: no FreeType header files detected.]) fi fi +fi ttf_includes="$CPPFLAGS" ttf_libs="$LIBS_TTF -lm -lttf" diff --git a/legacy/evas/src/evas_gl_routines.h b/legacy/evas/src/evas_gl_routines.h index a610c219e1..269aaf1250 100644 --- a/legacy/evas/src/evas_gl_routines.h +++ b/legacy/evas/src/evas_gl_routines.h @@ -23,11 +23,15 @@ typedef int GLuint; #include #include +#ifdef HAVE_FREETYPE1_FREETYPE_FREETYPE_H +#include +#else #ifdef HAVE_FREETYPE_FREETYPE_H #include #else #include #endif +#endif #include "Evas_private.h" #include "Evas.h" diff --git a/legacy/evas/src/evas_x11_routines.h b/legacy/evas/src/evas_x11_routines.h index bba14f277f..23d0b5d709 100644 --- a/legacy/evas/src/evas_x11_routines.h +++ b/legacy/evas/src/evas_x11_routines.h @@ -12,11 +12,15 @@ #include #include -#ifdef HAVE_FREETYPE_FREETYPE_H +#ifdef HAVE_FREETYPE1_FREETYPE_FREETYPE_H +#include +#else +# ifdef HAVE_FREETYPE_FREETYPE_H #include #else #include #endif +#endif #include "Evas_private.h" #include "Evas.h"