ref: dd27182038555f06844538c39cb700773dfe942f
parent: 7da4824dfb05ab88413b9cb52dff515283f32e52
author: David Turner <[email protected]>
date: Tue Dec 11 08:38:52 EST 2001
* builds/unix/freetype-config.in: modified the script to prevent
passing "-L/usr/lib" to gcc
* docs/FTL.TXT: simple fix (change "LICENSE.TXT" to "FTL.TXT")
* builds/unix/freetype2.m4: added autoconf macro, we need to install
it in $(prefix)/share/aclocal/freetype2.m4 but I didn't modified
builds/unix/install.mk yet..
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,23 @@
-2001-12-11 Detlef W�rkner ([email protected])
+2001-12-11 David Turner <[email protected]>
- * include/freetype/internal/ftstream.h: fixed the definitions of
- GET_LongLE and GET_ULongLE which where incorrect (creating problems
- in the pcf driver)..
+ * builds/unix/freetype-config.in: modified the script to prevent
+ passing "-L/usr/lib" to gcc
+ * docs/FTL.TXT: simple fix (change "LICENSE.TXT" to "FTL.TXT")
+
+ * builds/unix/freetype2.m4: added autoconf macro, we need to install
+ it in $(prefix)/share/aclocal/freetype2.m4 but I didn't modified
+ builds/unix/install.mk yet..
+
* INSTALL: updated the instructions to build shared libraries with
Jam.. they were simply erroneous..
+
+
+2001-12-11 Detlef W�rkner >[email protected]>
+
+ * include/freetype/internal/ftstream.h: fixed the definitions of
+ GET_LongLE and GET_ULongLE which where incorrect (creating problems
+ in the pcf driver)..
2001-12-10 Francesco Zappa Nardelli <[email protected]>
--- a/builds/unix/freetype-config.in
+++ b/builds/unix/freetype-config.in
@@ -73,17 +73,25 @@
if test "$echo_prefix" = "yes"; then
echo $prefix
fi
+
if test "$echo_exec_prefix" = "yes"; then
echo $exec_prefix
fi
+
if test "$echo_cflags" = "yes"; then
cflags="-I@includedir@/freetype2"
echo $cflags $includes
fi
+
if test "$echo_libs" = "yes"; then
libs="-lfreetype"
- echo -L@libdir@ $libs
+ if test "@libdir@" != "/usr/lib" ; then
+ echo -L@libdir@ $libs
+ else
+ echo $libs
+ fi
fi
+
if test "$echo_libtool" = "yes"; then
convlib="libfreetype.la"
echo @libdir@/$convlib
--- /dev/null
+++ b/builds/unix/freetype2.m4
@@ -1,0 +1,123 @@
+# Configure paths for FreeType2
+# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
+
+dnl AM_CHECK_FT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for FreeType2, and define FT2_CFLAGS and FT2_LIBS
+dnl
+AC_DEFUN(AC_CHECK_FT2,
+[dnl
+dnl Get the cflags and libraries from the freetype-config script
+dnl
+AC_ARG_WITH(freetype-prefix,
+[ --with-ft-prefix=PFX Prefix where FreeType is installed (optional)],
+ ft_config_prefix="$withval", ft_config_prefix="")
+AC_ARG_WITH(freetype-exec-prefix,
+[ --with-ft-exec-prefix=PFX Exec prefix where FreeType is installed (optional)],
+ ft_config_exec_prefix="$withval", ft_config_exec_prefix="")
+AC_ARG_ENABLE(freetypetest, [ --disable-freetypetest Do not try to compile and run a test FreeType program],[],
+ enable_fttest=yes)
+
+if test x$ft_config_exec_prefix != x ; then
+ ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
+ if test x${FT2_CONFIG+set} != xset ; then+ FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
+ fi
+fi
+if test x$ft_config_prefix != x ; then
+ ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
+ if test x${FT2_CONFIG+set} != xset ; then+ FT2_CONFIG=$ft_config_prefix/bin/freetype-config
+ fi
+fi
+AC_PATH_PROG(FT2_CONFIG, freetype-config, no)
+
+min_ft_version=ifelse([$1], ,6.1.0,$1)
+AC_MSG_CHECKING(for FreeType - version >= $min_ft_version)
+no_ft=""
+if test "$FT2_CONFIG" = "no" ; then
+ no_ft=yes
+else
+ FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
+ FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
+ ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ ft_min_major_version=`echo $min_ft_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ ft_min_minor_version=`echo $min_ft_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ ft_min_micro_version=`echo $min_ft_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test "x$enable_fttest" = "xyes" ; then
+ ft_config_version=$(( \
+ $ft_config_major_version*10000 + \
+ $ft_config_minor_version*100 + \
+ $ft_config_micro_version))
+ ft_min_version=$(( \
+ $ft_min_major_version*10000 + \
+ $ft_min_minor_version*100 + \
+ $ft_min_micro_version))
+ if test $ft_config_version -lt $ft_min_version ; then
+ ifelse([$3], , :, [$3])
+ else
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $FT2_CFLAGS"
+ LIBS="$FT2_LIBS $LIBS"
+dnl
+dnl Sanity checks the results of freetype-config to some extent
+dnl
+ AC_TRY_RUN([
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{+ FT_Library library;
+ FT_Error error;
+
+ error = FT_Init_FreeType( &library );
+
+ if ( error )
+ {+ return 1;
+ } else {+ FT_Done_FreeType( library );
+ return 0;
+ }
+}
+],, no_ft=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi # test $ft_config_version -lt $ft_min_version
+ fi # test "x$enable_fttest" = "xyes"
+fi # test "$FT2_CONFIG" = "no"
+if test "x$no_ft" = x ; then
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+else
+ AC_MSG_RESULT(no)
+ if test "$FT2_CONFIG" = "no" ; then
+ echo "*** The freetype-config script installed by FT2 could not be found"
+ echo "*** If FT2 was installed in PREFIX, make sure PREFIX/bin is in"
+ echo "*** your path, or set the FT2_CONFIG environment variable to the"
+ echo "*** full path to freetype-config."
+ else
+ echo "*** The FreeType test program failed to run. If your system uses"
+ echo "*** shared libraries and they are installed outside the normal"
+ echo "*** system library path, make sure the variable LD_LIBRARY_PATH"
+ echo "*** (or whatever is appropiate for your system) is correctly set."
+ fi
+ FT2_CFLAGS=""
+ FT2_LIBS=""
+ ifelse([$3], , :, [$3])
+fi
+AC_SUBST(FT2_CFLAGS)
+AC_SUBST(FT2_LIBS)
+])
--- a/docs/FTL.txt
+++ b/docs/FTL.txt
@@ -94,7 +94,7 @@
herein, subject to the following conditions:
o Redistribution of source code must retain this license file
- (`LICENSE.TXT') unaltered; any additions, deletions or changes
+ (`FTL.TXT') unaltered; any additions, deletions or changes
to the original files must be clearly indicated in
accompanying documentation. The copyright notices of the
unaltered, original files must be preserved in all copies of