git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use xpdf's config files.
[swftools.git]
/
m4
/
fontconfig.m4
diff --git
a/m4/fontconfig.m4
b/m4/fontconfig.m4
index
6cfc6a0
..
98da5a2
100644
(file)
--- a/
m4/fontconfig.m4
+++ b/
m4/fontconfig.m4
@@
-15,7
+15,7
@@
# Substitutes:
#
# Substitutes:
#
-AC_DEFUN(RFX_CHECK_FONTCONFIG,
+AC_DEFUN([RFX_CHECK_FONTCONFIG],
[
OLDCPPFLAGS="${CPPFLAGS}"
OLDLIBS="${LIBS}"
[
OLDCPPFLAGS="${CPPFLAGS}"
OLDLIBS="${LIBS}"
@@
-24,8
+24,8
@@
if test -d /usr/include/fontconfig; then
CPPFLAGS="$CPPFLAGS -I/usr/include/fontconfig"
fi
CPPFLAGS="$CPPFLAGS -I/usr/include/fontconfig"
fi
-AC_CHECK_LIB(fontconfig, FcInit,HAVE_LIB_FONTCONFIG=1,)
-AC_CHECK_HEADERS(fontconfig.h,HAVE_FONTCONFIG_H=1)
+AC_CHECK_LIB(fontconfig, FcInit, [HAVE_LIB_FONTCONFIG=1],)
+AC_CHECK_HEADERS(fontconfig.h,[HAVE_FONTCONFIG_H=1])
if test "x${HAVE_LIB_FONTCONFIG}" != "x";then
if test "x${HAVE_FONTCONFIG_H}" != "x";then
if test "x${HAVE_LIB_FONTCONFIG}" != "x";then
if test "x${HAVE_FONTCONFIG_H}" != "x";then
@@
-83,7
+83,7
@@
EOF
ac_link='$CC $CPPFLAGS $CFLAGS conftest.c $LDFLAGS $LIBS -o conftest${ac_exeext}'
if { (eval echo freetype.m4:71: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
AC_MSG_RESULT(yes)
ac_link='$CC $CPPFLAGS $CFLAGS conftest.c $LDFLAGS $LIBS -o conftest${ac_exeext}'
if { (eval echo freetype.m4:71: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
AC_MSG_RESULT(yes)
- AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1)
+ AC_DEFINE([HAVE_FONTCONFIG], [1], [Define if fontconfig is available])
else
echo "configure: failed program was:" >&5
cat conftest.c >&5
else
echo "configure: failed program was:" >&5
cat conftest.c >&5
@@
-94,7
+94,7
@@
EOF
fi
# if the above didn't work out, reset all changes to the compiler variables.
fi
# if the above didn't work out, reset all changes to the compiler variables.
-if test "x${HAVE_FREETYPE}" "!=" "x1"; then
+if test "x${HAVE_FONTCONFIG}" "!=" "x1"; then
CPPFLAGS=$OLDCPPFLAGS
LIBS=$OLDLIBS
fi
CPPFLAGS=$OLDCPPFLAGS
LIBS=$OLDLIBS
fi