forked from e16/e16
1
0
Fork 0

Tue Dec 21 11:07:46 PST 1999

(Mandrake)

added support for freetype in regular location OR in freetype/ subdirectory
(like the new versions)


SVN revision: 1721
This commit is contained in:
Mandrake 1999-12-21 11:07:26 +00:00
parent 43a73e0c38
commit 54a187e92a
4 changed files with 20 additions and 1 deletions

View File

@ -1649,3 +1649,11 @@ Fri Dec 10 11:09:41 PST 1999
i18n patch and other fixes from Peter Kjellerstedt
<peter.kjellerstedt@axis.com>.
-------------------------------------------------------------------------------
Tue Dec 21 11:07:46 PST 1999
(Mandrake)
added support for freetype in regular location OR in freetype/ subdirectory
(like the new versions)

View File

@ -146,7 +146,7 @@ echo "Automatic Upgrades have been turned off by request at compiletime"
fi
AC_SUBST(GHTTP_LIBS)
# AC_CHECK_HEADER(freetype.h, ,AC_MSG_ERROR([Fatal Error: no FreeType header detected.]))
AC_CHECK_HEADERS(freetype.h freetype/freetype.h,[ break] , )
AC_CHECK_LIB(ttf, TT_Init_FreeType, TTF_LIBS=-lttf, [
echo "ERROR: Enlightenment needs a system with libttf.so (TrueType Font Library)"
echo "You can obtain it from:"

View File

@ -53,7 +53,13 @@
#include <sys/resource.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#ifdef HAVE_FREETYPE_H
#include <freetype.h>
#endif
#ifdef HAVE_FREETYPE_FREETYPE_H
#include <freetype/freetype.h>
#endif
#define FILEPATH_LEN_MAX 4096

View File

@ -73,7 +73,12 @@
#include <sys/resource.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#ifdef HAVE_FREETYPE_H
#include <freetype.h>
#endif
#ifdef HAVE_FREETYPE_FREETYPE_H
#include <freetype/freetype.h>
#endif
#include "econfig.h"
/* workaround for 64bit architectures - xlib expects 32bit CARDINALS to be */