[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Freetype] AM_CHECK_FT2's odd behavior when config version < min ver
From: |
Werner LEMBERG |
Subject: |
Re: [Freetype] AM_CHECK_FT2's odd behavior when config version < min version |
Date: |
Fri, 11 Jan 2002 03:10:17 +0100 (CET) |
> I find that when I have FreeType2 on my system and the version I ask
> for is *greater* than the actual version that AM_CHECK_FT2
> http://www.freetype.org/cgi-bin/viewcvs.cgi/freetype2/builds/unix/freetype2.m4
> runs both the [ACTION-IF-NOT-FOUND] *and* the [ACTION-IF-FOUND]
> *in-that-order*.
Thanks for the report. This macro was severely broken (due to my
fault); it should be fixed now in the CVS. Please test.
David, this change should also go into the `stable' branch -- please
apply the attached patch.
Werner
--- freetype2.m4 Wed Dec 12 10:31:16 2001
+++ freetype2.m4.new Thu Jan 10 22:46:08 2002
@@ -1,23 +1,25 @@
# 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 AC_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)],
+AC_ARG_WITH(ft-prefix,
+[ --with-ft-prefix=PREFIX
+ 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)],
+AC_ARG_WITH(ft-exec-prefix,
+[ --with-ft-exec-prefix=PREFIX
+ 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)
+[ --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"
@@ -70,7 +72,7 @@
fi
fi
fi
- if test "x$ft_config_is_lt" = "xyes" ; then
+ if test "x$ft_config_is_lt" = "xno" ; then
ifelse([$3], , :, [$3])
else
ac_save_CFLAGS="$CFLAGS"