php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 14:01:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed lame attempt to prevent ttf linkage when using freetype2

Browse Source
This commit is contained in:
Wez Furlong
2001-04-17 01:02:37 +00:00
parent 0edbf4242f
commit fe88b5fd6e
1 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
ext/gd/config.m4
View File

@@ -248,43 +248,41 @@ if test "$with_gd" != "no" && test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
fi
])
if test "$with_freetype_dir" != "no" ; then
CHECK_TTF=""
else
CHECK_TTF="$withval"
fi
AC_MSG_CHECKING(whether to include FreeType 1.x support)
if test -n "$CHECK_TTF" ; then
for i in /usr /usr/local "$CHECK_TTF" ; do
if test -f "$i/include/freetype.h" ; then
TTF_DIR="$i"
unset TTF_INC_DIR
fi
if test -f "$i/include/freetype/freetype.h"; then
TTF_DIR="$i"
TTF_INC_DIR="$i/include/freetype"
fi
done
if test -n "$TTF_DIR" ; then
AC_DEFINE(HAVE_LIBTTF,1,[ ])
if test "$shared" = "yes"; then
GD_LIBS="$GD_LIBS -lttf"
GD_LFLAGS="$GD_LFLAGS -L$TTF_DIR/lib"
else
PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib)
fi
if test -z "$TTF_INC_DIR"; then
TTF_INC_DIR="$TTF_DIR/include"
fi
PHP_ADD_INCLUDE($TTF_INC_DIR)
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
else
AC_MSG_RESULT(no)
fi
if test "$with_freetype_dir" = "no" ; then
if test -n "$CHECK_TTF" ; then
for i in /usr /usr/local "$CHECK_TTF" ; do
if test -f "$i/include/freetype.h" ; then
TTF_DIR="$i"
unset TTF_INC_DIR
fi
if test -f "$i/include/freetype/freetype.h"; then
TTF_DIR="$i"
TTF_INC_DIR="$i/include/freetype"
fi
done
if test -n "$TTF_DIR" ; then
AC_DEFINE(HAVE_LIBTTF,1,[ ])
if test "$shared" = "yes"; then
GD_LIBS="$GD_LIBS -lttf"
GD_LFLAGS="$GD_LFLAGS -L$TTF_DIR/lib"
else
PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib)
fi
if test -z "$TTF_INC_DIR"; then
TTF_INC_DIR="$TTF_DIR/include"
fi
PHP_ADD_INCLUDE($TTF_INC_DIR)
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
else
AC_MSG_RESULT(no)
fi
else
AC_MSG_RESULT(no - FreeType 2.x is to be used instead)
fi
AC_MSG_CHECKING(for T1lib support)
AC_ARG_WITH(t1lib,