mirror of
https://git.freebsd.org/ports.git
synced 2025-07-11 06:19:19 -04:00
b34fbea816
freetype2 support properly (unless WITHOUT_IMAGEMAGICK_TTF is not defined). Patches have been sent to the developer forum. Hopefully the next version to 6.0.0 will include the fix.
49 lines
1.6 KiB
Text
49 lines
1.6 KiB
Text
--- configure.bak Fri Feb 6 09:19:49 2004
|
|
+++ configure Wed Apr 21 16:47:25 2004
|
|
@@ -23161,6 +23161,7 @@
|
|
|
|
# This can be used to rebuild libtool when needed
|
|
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
|
|
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
|
|
|
|
# Always use our own libtool.
|
|
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
|
@@ -37277,10 +37278,10 @@
|
|
done
|
|
if test -n "$freetype_config"
|
|
then
|
|
- freetype_prefix=`freetype-config --prefix`
|
|
- freetype_exec_prefix=`freetype-config --exec-prefix`
|
|
- LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
|
|
- CPPFLAGS="-I${freetype_prefix}/include/freetype2 $CPPFLAGS"
|
|
+ freetype_cflags=`$freetype_config --cflags`
|
|
+ freetype_libs=`$freetype_config --libs`
|
|
+ LDFLAGS="$LDFLAGS $freetype_libs"
|
|
+ CPPFLAGS="$freetype_cflags $CPPFLAGS"
|
|
fi
|
|
fi
|
|
|
|
@@ -37621,10 +37622,10 @@
|
|
done
|
|
if test -n "$freetype_config"
|
|
then
|
|
- freetype_prefix=`freetype-config --prefix`
|
|
- freetype_exec_prefix=`freetype-config --exec-prefix`
|
|
- LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
|
|
- CPPFLAGS="-I${freetype_prefix}/include/freetype2 $CPPFLAGS"
|
|
+ freetype_cflags=`$freetype_config --cflags`
|
|
+ freetype_libs=`$freetype_config --libs`
|
|
+ LDFLAGS="$LDFLAGS $freetype_libs"
|
|
+ CPPFLAGS="$freetype_cflags $CPPFLAGS"
|
|
fi
|
|
fi
|
|
|
|
@@ -37906,7 +37907,7 @@
|
|
fi
|
|
|
|
|
|
- if test "$have_freetype_h" = 'yes'
|
|
+ if test "$ac_cv_header_ft2build_h" = 'yes' || test "$have_freetype_h" = 'yes'
|
|
then
|
|
passed=`expr $passed + 1`
|
|
else
|