dnl version. This same version number must appear in fontconfig/fontconfig.h
dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from fontconfig.h
-AM_INIT_AUTOMAKE(fontconfig, 2.1.92)
+AM_INIT_AUTOMAKE(fontconfig, 2.1.94)
dnl libtool versioning
ft_config="$freetype_config"
fi
-FREETYPE_CFLAGS="$($ft_config --cflags)"
-FREETYPE_LIBS="$($ft_config --libs)"
+FREETYPE_CFLAGS="`$ft_config --cflags`"
+FREETYPE_LIBS="`$ft_config --libs`"
AC_SUBST(FREETYPE_LIBS)
AC_SUBST(FREETYPE_CFLAGS)
esac
;;
esac
- CPPFLAGS="$saved_CPPFLAGS"
- LIBS="$saved_LIBS"
+ CPPFLAGS="$expatsaved_CPPFLAGS"
+ LIBS="$expatsaved_LIBS"
;;
esac
AC_SUBST(EXPAT_LIBS)
x)
if test -d "$dir/fonts"; then
for sub in "$dir"/fonts/*; do
- if ls "$sub" | grep -q -i '\.pf\|\.tt\|.ot'; then
+ if ls "$sub" | grep -q -i '\.pf\|\.tt\|\.ot'; then
case x$FC_ADD_FONTS in
x)
FC_ADD_FONTS="$sub"