From: kramm Date: Sat, 4 Sep 2004 00:54:49 +0000 (+0000) Subject: Generated from configure.in X-Git-Tag: xpdf-3-00~44 X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=2aa16354be81743de06885ce8fbf6f80f24dfef2 Generated from configure.in --- diff --git a/configure b/configure index 778079c..68d36b8 100755 --- a/configure +++ b/configure @@ -10103,7 +10103,7 @@ done OLDCPPFLAGS="${CPPFLAGS}" OLDLIBS="${LIBS}" -if test "x${FREETYPE_CONFIG}" != "x"; then +if test "x${FREETYPE_CONFIG}" '!=' "x"; then CPPFLAGS="$CPPFLAGS "`freetype-config --cflags` else if test -d /usr/include/freetype2; then CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2" @@ -10482,14 +10482,17 @@ fi done -if test "x${HAVE_LIB_FREETYPE}" != "x";then -if test "x${HAVE_FREETYPE_FREETYPE_H}" != "x";then - HAVE_FREETYPE=1 -fi +if test "x${HAVE_LIB_FREETYPE}" '!=' "x";then + if test "x${HAVE_FREETYPE_FREETYPE_H}" '!=' "x";then + HAVE_FREETYPE=1 + fi + if test "x${HAVE_FT2BUILD_H}" '!=' "x";then + HAVE_FREETYPE=1 + fi fi if test "x${HAVE_FREETYPE}" = "x1"; then - if test "x{$FREETYPE_CONFIG}" != "x"; then + if test "x{$FREETYPE_CONFIG}" '!=' "x"; then LIBS="$LIBS "`freetype-config --libs` else LIBS="$LIBS -lfreetype" @@ -10581,7 +10584,7 @@ echo "${ECHO_T}no" >&6 fi # if the above didn't work out, reset all changes to the compiler variables. -if test "x${HAVE_FREETYPE}" "!=" "x1"; then +if test "x${HAVE_FREETYPE}" '!=' "x1"; then CPPFLAGS=$OLDCPPFLAGS LIBS=$OLDLIBS fi