* builds/unix/freetype2.m4: s/AC_PATH_PROG/AC_PATH_TOOL/.
This simplifies cross-compiling.
This commit is contained in:
parent
d708658c4a
commit
cf2347c962
|
@ -1,3 +1,9 @@
|
||||||
|
2014-06-17 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
* builds/unix/freetype2.m4: s/AC_PATH_PROG/AC_PATH_TOOL/.
|
||||||
|
|
||||||
|
This simplifies cross-compiling.
|
||||||
|
|
||||||
2014-06-13 Werner Lemberg <wl@gnu.org>
|
2014-06-13 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
Fix more compiler warnings.
|
Fix more compiler warnings.
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Configure paths for FreeType2
|
# Configure paths for FreeType2
|
||||||
# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
|
# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
|
||||||
#
|
#
|
||||||
# Copyright 2001, 2003, 2007, 2009 by
|
# Copyright 2001, 2003, 2007, 2009, 2014 by
|
||||||
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||||
#
|
#
|
||||||
# This file is part of the FreeType project, and may only be used, modified,
|
# This file is part of the FreeType project, and may only be used, modified,
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
# generated by Autoconf, under the same distribution terms as the rest of
|
# generated by Autoconf, under the same distribution terms as the rest of
|
||||||
# that program.
|
# that program.
|
||||||
#
|
#
|
||||||
# serial 3
|
# serial 4
|
||||||
|
|
||||||
# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||||
# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
|
# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
|
||||||
|
@ -61,7 +61,7 @@ AC_DEFUN([AC_CHECK_FT2],
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$FT2_CONFIG" = x ; then
|
if test "x$FT2_CONFIG" = x ; then
|
||||||
AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no])
|
AC_PATH_TOOL([FT2_CONFIG], [freetype-config], [no])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
min_ft_version=m4_if([$1], [], [7.0.1], [$1])
|
min_ft_version=m4_if([$1], [], [7.0.1], [$1])
|
||||||
|
|
Loading…
Reference in New Issue