Commit 822ec78c authored by Keith Packard's avatar Keith Packard

Merge branch 'fc-2_4_branch' to master

Moving development back to master.
parents e79c648c fb2092c1
......@@ -9,6 +9,7 @@ config.log
config.status
config.sub
configure
debian
depcomp
fontconfig.pc
fontconfig.spec
......
tags
*.tar.gz
.libs
.deps
*.o
*.lo
*.la
ChangeLog
Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
depcomp
fontconfig-zip
fontconfig.pc
fontconfig.spec
fonts.conf
install-sh
libtool
ltmain.sh
missing
stamp-h1
doc/*.3
doc/confdir.sgml
doc/edit-sgml
doc/fcatomic.sgml
doc/fcblanks.sgml
doc/fccharset.sgml
doc/fcconfig.sgml
doc/fcconstant.sgml
doc/fcfile.sgml
doc/fcfontset.sgml
doc/fcfreetype.sgml
doc/fcinit.sgml
doc/fcmatrix.sgml
doc/fcobjectset.sgml
doc/fcobjecttype.sgml
doc/fcpattern.sgml
doc/fcstring.sgml
doc/fcstrset.sgml
doc/fcvalue.sgml
doc/fontconfig-devel.pdf
doc/fontconfig-devel.txt
doc/fontconfig-devel
doc/fontconfig-user.html
doc/fontconfig-user.pdf
doc/fontconfig-user.txt
doc/fonts-conf.5
doc/func.refs
doc/local-fontconfig-devel.sgml
doc/local-fontconfig-user.sgml
doc/version.sgml
fc-arch/fc-arch
fc-arch/fcarch.h
fc-cache/fc-cache
fc-cache/fc-cache.1
fc-case/fc-case
fc-case/fccase.h
fc-cat/fc-cat
fc-cat/fc-cat.1
fc-glyphname/fc-glyphname
fc-glyphname/fcglyphname.h
fc-lang/fc-lang
fc-lang/fclang.h
fc-list/fc-list
fc-list/fc-list.1
fc-match/fc-match
fc-match/fc-match.1
src/fontconfig.def
Keith Packard <keithp@keithp.com>
Patrick Lam <plam@mit.edu>
This diff is collapsed.
......@@ -13,22 +13,33 @@ important steps:
1. Update the version numbers
configure.in
fontconfig/fontconfig.h
2. Fix the README
Change version number
Set the date
3. Commit those changes
4. rebuild the configuration files with autogen.sh
sh autogen.sh --sysconfdir=/etc --prefix=/usr --mandir=/usr/share/man
5. make distcheck
sh autogen.sh --sysconfdir=/etc --prefix=/usr --mandir=/usr/share/man --localstatedir=/var
5. make distcheck (NB: won't work without docbook-utils -PL)
6. tag the tree
cvs tag fc-2_2_xx
7. Split out the ChangeLog into ChangeLog-2.2.xx with
the changes since the previous release
8. Copy ChangeLog-2.2.xx and fontconfig-2.2.xx.tar.gz to
git-tag -u 096c4dd3 -m'Version 2.3.xx' 2.3.xx
7. make Changelog-2.3.xx
git-log 2.3.(xx-1).. > ChangeLog-2.3.xx
8. Copy ChangeLog-2.3.xx and fontconfig-2.3.xx.tar.gz to
freedesktop.org:/srv/fontconfig.freedesktop.org/www/release
9. Update the Fontconfig Devel wiki page
http://fontconfig.org/wiki/Devel
10. Compute md5sums for release files:
md5sum fontconfig-2.2.xx.tar.gz ChangeLog-2.2.xx
md5sum fontconfig-2.3.xx.tar.gz ChangeLog-2.3.xx
11. Post a note to fontconfig@fontconfig.org. Include the md5sums.
gpg sign the message.
......@@ -22,40 +22,8 @@
# PERFORMANCE OF THIS SOFTWARE.
DOCSRC=@DOCSRC@
SUBDIRS=fontconfig fc-case fc-lang fc-glyphname src \
fc-cache fc-list fc-match conf.d $(DOCSRC) test
DEBIAN = \
debian/changelog \
debian/compat \
debian/control \
debian/copyright \
debian/fontconfig.config \
debian/fontconfig.defoma \
debian/fontconfig.dirs \
debian/fontconfig.install \
debian/fontconfig.postinst \
debian/fontconfig.postrm \
debian/fontconfig.templates \
debian/fontconfig-udeb.install \
debian/libfontconfig1-dev.install \
debian/libfontconfig1.install \
debian/local.conf.md5sum \
debian/README.Debian \
debian/rules \
debian/po/POTFILES.in \
debian/po/templates.pot \
debian/po/cs.po \
debian/po/da.po \
debian/po/de.po \
debian/po/es.po \
debian/po/fr.po \
debian/po/ja.po \
debian/po/nl.po \
debian/po/pt_BR.po \
debian/po/pt.po \
debian/po/tr.po \
debian/po/zh_CN.po
SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \
fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test
EXTRA_DIST = \
fontconfig.pc.in \
......@@ -63,8 +31,22 @@ EXTRA_DIST = \
fonts.dtd \
fontconfig.spec.in \
fontconfig.spec \
fontconfig-zip.in \
$(DEBIAN)
fontconfig-zip.in
DISTCLEANFILES = config.cache
MAINTAINERCLEANFILES = \
$(srcdir)/aclocal.m4 \
$(srcdir)/autoscan.log \
$(srcdir)/compile \
$(srcdir)/config.guess \
$(srcdir)/config.h.in \
$(srcdir)/config.sub \
$(srcdir)/configure.scan \
$(srcdir)/depcomp \
$(srcdir)/install-sh \
$(srcdir)/ltmain.sh \
$(srcdir)/missing \
$(srcdir)/mkinstalldirs \
`find "$(srcdir)" -type f -name Makefile.in -print`
pkgconfigdir=$(libdir)/pkgconfig
pkgconfig_DATA = fontconfig.pc
......@@ -78,6 +60,30 @@ else
RUN_FC_CACHE_TEST=test -z "$(DESTDIR)"
endif
# Creating ChangeLog from git log:
MAINTAINERCLEANFILES += ChangeLog
EXTRA_DIST += ChangeLog
ChangeLog: $(srcdir)/ChangeLog
$(srcdir)/ChangeLog:
@if test -d "$(srcdir)/.git"; then \
(cd "$(srcdir)" && \
./missing --run git-log --stat) | fmt --split-only > $@.tmp \
&& mv -f $@.tmp $@ \
|| ($(RM) $@.tmp; \
echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
(test -f $@ || echo git-log is required to generate this file >> $@)); \
else \
test -f $@ || \
(echo A git checkout and git-log is required to generate ChangeLog >&2 && \
echo A git checkout and git-log is required to generate this file >> $@); \
fi
.PHONY: ChangeLog $(srcdir)/ChangeLog
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(configdir)
if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
......@@ -91,16 +97,16 @@ install-data-local:
echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
$(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
fi; fi
if $(RUN_FC_CACHE_TEST); then \
echo " fc-cache/fc-cache -f -v"; \
fc-cache/fc-cache -f -v; \
@(if $(RUN_FC_CACHE_TEST); then \
echo " fc-cache/fc-cache -s -f -v"; \
fc-cache/fc-cache -s -f -v; \
else \
echo "***"; \
echo "*** Warning: fonts.cache not built"; \
echo "***"; \
echo "*** Generate this file manually on host system using fc-cache"; \
echo "***"; \
fi
fi)
uninstall-local:
if [ -f $(srcdir)/fonts.conf ]; then \
......
Fontconfig
Font configuration and customization library
Version 2.3.2
2005-4-27
Version 2.3.96
2006-09-03
Check INSTALL for compilation and installation instructions.
Report bugs to https://bugs.freedesktop.org in the fontconfig module.
2.3.96
Keith Packard:
Make path names in cache files absolute (NB, cache format change) Stop
Eliminate pattern freezing
Add .gitignore
Construct short architecture name from architecture signature.
Write caches to first directory with permission. Valid cache in FcDirCacheOpen.
Eliminate NormalizeDir. Eliminate gratuitous stat/access calls per dir.
Add architecture to cache filename.
Eliminate global cache. Eliminate multi-arch cache code.
Fix up fc-cache and fc-cat for no global cache changes.
Eliminate ./ and ../ elements from font directory names when scanning.
Regenerate x86 line in fcarch.tmpl.h to match change in cache data.
Add x86-64 architecture and signature.
During test run, remove cache directory to avoid stale cache usage.
Add ppc architecture
Revert to original FcFontSetMatch algorithm to avoid losing fonts.
Rework cache files to use offsets for all data structures.
Fix build problems caused by cache rework.
FcCharSetSerialize was using wrong offset for leaves. Make fc-cat work.
Rework Object name database to unify typechecking and object lookup.
Skip broken caches. Cache files are auto-written, don't rewrite in fc-cache.
Fix fc-cat again. Sigh.
Use intptr_t instead of off_t inside FcCache structure.
Serialized value lists were only including one value.
Automatically remove invalid cache files.
With no args, fc-cat now dumps all directories.
Revert ABI changes from version 2.3
Change $(pkgcachedir) to $(fc_cachedir) in fc-cat and fc-cache Makefile.am
Allow FcTypeLangSet to match either FcTypeLangSet or FcTypeString.
Remove stale architecture signatures.
Pass directory information around in FcCache structure. Freeze charsets.
Fix fc-lang to use new charset freezer API.
Fontset pattern references are relative to fontset, not array.
Add some ignores
Only rebuild caches for system fonts at make install time.
Fix memory leaks in fc-cache directory cleaning code.
Add @EXPAT_LIBS@ to Libs.private in fontconfig.pc (bug 7683)
Avoid #warning directives on non-GCC compilers. (bug 7683)
Chinese/Macau needs the Hong Kong orthography instead of Taiwan (bug 7884)
Add Assamese orthography (as.orth). Bug #8050
Really only rebuild caches for system fonts at make install time.
Fonts matching lang not territory should satisfy sort pattern lang.
Prefer Bitstream Vera to DejaVu families.
Guess that mac roman names with lots of high bits are actually SJIS.
Document FC_DEBUG values (bug 6393). Document name \ escape syntax.
Move Free family names to bottom of respective aliases. (bug 7429)
Unify directory canonicalization into FcStrAddFilename.
Allow font caches to contain newer version numbers
Add FcMatchScan to resolve Delicious font matching issues (bug #6769)
Fix missing initialization/destruction of new 'scan' target subst list.
Don't segfault when string values can't be parsed as charsets or langsets.
Using uninitialized (and wrong) variable in FcStrCopyFilename.
Oops; missed the 60-delicious.conf file.
Patrick Lam:
Keith Packard <keithp@keithp.com>
2006-04-27 Paolo Borelli (pborelli@katamail.com) reviewed by: plam
2006-05-31 Yong Li (rigel863@gmail.com) reviewed by: plam, Bedhad Esfahbod
2006-07-19 Jon Burgess (jburgess@uklinux.net) reviewed by: plam
2006-08-04 Keith Packard (keithp@keithp.com) reviewed by: plam
2.3.95
Match 'Standard Symbols L' for 'Symbol'. Add URW fonts as aliases for
all of the PostScript fonts. (reported by Miguel Rodriguez). Fix a
number of Coverity defects (Frederic Crozat). Speed up FcFontSort
(fix suggested by Kenichi Handa). Fix error with charsets. Survive
missing docbook2pdf. Compile on HP-UX, AIX, SGI and Windows (Cygwin,
MinGW). Fix intel compiler warnings. Fix multiarch support (don't
destroy multiarch files!) Require pkg-config. (Thanks Behdad; better
solution wanted for libxml2 detection!) Fix typos in orth files and
add orth for Lingala (reported by Denis Jacquerye). Remove debian/
directory. Add a configuration file that disables hinting for the
Lohit Gujarati font (since the hinting distorts some glyphs quite
badly). Sort directory entries while scanning them from disk;
prevents Heisenbugs due to file ordering in a directory (due to Egmont
Koblinger). Fix Wine's problem with finding fonts. (Reported by
Bernhard Rosenkraenzer.) Fix the issues with GNU libiconv vs. libc
iconv (which especially appear on Solarii); patch by Behdad Esfahbod,
approach suggested by Tim Mooney.
2.3.94
fc-cat can take directories as input and creates old-style fonts.cache
listings.
fc-cache takes -r --really-force which blows away all old caches and
regenerates.
Robustness fixes, integer overflow fixes (notably to cache handling
code), toast broken global cache files.
Change binary format to make it compatible with static langset
information (thanks to Takashi Iwai).
Open hashed caches before fonts.cache-2 (Takashi Iwai).
Fix FcFontSetMatch's algorithm, which used to unjustly kill fonts for
not declaring certain elements (Takashi Iwai).
Fix matching bug when multiple elements match; don't use
the sum of all scores, but the best score (James Su).
Make fc-lang more friendly to Windows systems.
Remove archaic chars from Georgian charset; add Euro character to
charsets for European languages.
Fix treatment of broken PCF fonts that don't declare family names.
Pass O_BINARY to open if appropriate (reported by Doodle).
Normalize font directories to the form in which they appear in
config files.
Add a record of the cached directory to the cache file.
Perf optimizations (Dirk Mueller; some reported by Michael Meeks.)
Don't loop infinitely on recursive symlinks.
Make 'make distcheck' work with automake 1.6.3.
Replace 'stamp' target with mkinstalldirs.
Don't stop scanning if a directory in fonts.conf doesn't exist,
because subsequent directories might exist.
Put directory names into global cache (reported by Ronny V. Vindenes).
Treat zh-hk fonts differently from zh-tw fonts. This patch may cause
fontconfig to treat A-X fonts differently from A-Y fonts; please mail
the fontconfig list if this causes any problems.
Fix for unaligned memory accesses (Andreas Schwab).
Fix treatment of cache directory as read from cache file; don't use
string equality to determine if we have the right file, use inode
equality.
Properly skip past dir caches that contain zero fonts, as occurs
in global caches (reported by Mike Fabian).
Print out full pathname in fc-match -v (reported by Frederic Crozat).
Fix bug where fc-match crashes when given __DUMMY__ property to
match on.
2.3.93
Create cache files in /var/cache/fontconfig with hashed filenames, if
possible, for added FHS compliance.
Make fc-cat read both per-directory and global cache files.
Add config file for Persian fonts from Sharif FarsiWeb, Inc.
Major performance improvements by Dirk Mueller, Stephen Kulow, and Michael Matz at SuSE: in particular, speed up FcFontSetMatch, and inline many functions.
Fix treatment of globs in config files, broken since 2.3.2 and discovered by Mathias Clasen.
Don't use freetype internal headers (patch by Matthias Clasen).
Further space improvements: create langsets statically, so that they can live in .rodata.
Properly align mmapped data structures to make e.g. ia64 happy.
Bug fixes.
2.3.92
Fix corrupted caches bugs from 2.3.91 (reported by Mike Fabian).
Store only basename in the cache, reconstitute on demand
(reported by James Cloos).
Change the rule for artificial emboldening in fonts.conf.in. This
enables the support for artificial emboldening included in cairo
(patch by Zhe Su).
Add FC_EMBEDDED_BITMAP object type to tell Xft/Cairo whether
to load embedded bitmaps or not (patch by Jinghua Luo).
Fix GCC4 warnings (some by Behdad Esfahbod).
Support localized font family and style names; this has been reported
to break old apps like xfd, but modern (gtk+/qt/mozilla) apps work
fine (patch by Zhe Su).
Prevent fc-list from escaping strings when printing them (reported by
Matthias Clasen).
Add valist sentinel markup for FcObjectSetBuild and
FcPatternBuild (patch by Marcus Meissner).
Add consts to variables so as to move arrays into .rodata (patch by
Ross Burton).
Modify config file to use Greek fonts before Asian fonts with
Greek glyphs. (patch by Simos Xenitellis).
Use libtool -no-undefined flag on all platforms (patch by Christian
Biesinger).
2.3.91
Use libxml2 if requested or if expat not available. (Mathias Hasselmann)
Fix multi-arch cache files: compute the position for the
block to be added using info from OrigFile, not NewFile. (plam)
Cast results of sizeof() to unsigned int to get rid of
warnings on x86_64 (reported by Matthias Clasen).
Use FcAtomic to rewrite cache files; don't unlink the fonts.cache-2
file even if there's no data to write; just write an empty cache file.
(Reported by Lubos Lunak)
Allocate room for the subdirectory names in each directory cache.
(Reported by James Cloos)
2.3.90
Development release of mmap patch: load pattern information
directly from cache files. (Patrick Lam)
2.3.2
Patch memory leaks in using iconv. (Reported by Chris Capoccia)
......
This diff is collapsed.
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- /etc/fonts/conf.d/60-delicious.conf -->
<fontconfig>
<!-- Fix-ups for Delicious family -->
<!-- Delicious 'heavy' variant says its Medium weight -->
<match target="scan">
<test name="family">
<string>Delicious</string>
</test>
<test name="style">
<string>Heavy</string>
</test>
<edit name="weight">
<const>heavy</const>
</edit>
</match>
</fontconfig>
......@@ -23,6 +23,8 @@
CONF_FILES = \
10LohitGujarati.conf \
10-fonts-persian.conf \
60-delicious.conf \
autohint.conf \
no-bitmaps.conf \
no-sub-pixel.conf \
......
This diff is collapsed.
This diff is collapsed.
......@@ -33,7 +33,7 @@ dnl This is the package version number, not the shared library
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.3.2)
AM_INIT_AUTOMAKE(fontconfig, 2.3.96)
AM_MAINTAINER_MODE
dnl libtool versioning
......@@ -78,14 +78,16 @@ fi
AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
WARN_CFLAGS=""
if test "x$GCC" = "xyes"; then
WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes \
-Wmissing-prototypes -Wmissing-declarations \
-Wnested-externs -fno-strict-aliasing"
AC_DEFINE_UNQUOTED(HAVE_WARNING_CPP_DIRECTIVE,1,
[Can use #warning in C files])
fi
AC_SUBST(WARN_CFLAGS)
dnl ==========================================================================
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
......@@ -132,18 +134,69 @@ AC_SUBST(EXEEXT_FOR_BUILD)
dnl ==========================================================================
AC_ARG_WITH(arch, [ --with-arch=ARCH Force architecture to ARCH], arch="$withval", arch=auto)
if test $cross_compiling = yes; then
case "$arch" in
auto)
AC_MSG_ERROR([Cannot autodetect architecture in cross compile environment]
[Use --with-arch=ARCH to specify architecture])
;;
esac
fi
ARCHITECTURE=$arch
AC_SUBST(ARCHITECTURE)
dnl ==========================================================================
# Checks for header files.
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h iconv.h])
AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_C_INLINE
AC_TYPE_PID_T
# Checks for library functions.
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long iconv])
AC_FUNC_MMAP
AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand_r])
#
# Checks for iconv
#
AC_MSG_CHECKING([for a usable iconv])
ICONV_LIBS=""
AC_TRY_LINK([#include <iconv.h>],
[iconv_open ("from", "to");],
[use_iconv=1],
[use_iconv=0])
if test x$use_iconv = x1; then
AC_MSG_RESULT([libc])
else
# try using libiconv
fontconfig_save_libs="$LIBS"
LIBS="$LIBS -liconv"
AC_TRY_LINK([#include <iconv.h>],
[iconv_open ("from", "to");],
[use_iconv=true],
[use_iconv=false])
if test x$use_iconv = x1; then
ICONV_LIBS="-liconv"
AC_MSG_RESULT([libiconv])
else
AC_MSG_RESULT([no])
fi
LIBS="$fontconfig_save_libs"
fi
AC_SUBST(ICONV_LIBS)
AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv,[Use iconv.])
#
# Checks for FreeType
......@@ -197,102 +250,124 @@ AC_ARG_WITH(expat, [ --with-expat=DIR Use Expat in DIR
AC_ARG_WITH(expat-includes, [ --with-expat-includes=DIR Use Expat includes in DIR], expat_includes=$withval, expat_includes=yes)
AC_ARG_WITH(expat-lib, [ --with-expat-lib=DIR Use Expat library in DIR], expat_lib=$withval, expat_lib=yes)
case "$expat" in
no)
if test "$enable_libxml2" != "yes"; then
case "$expat" in
no)
;;
*)
case "$expat_includes" in
yes)
case "$expat" in
*)
case "$expat_includes" in
yes)
case "$expat" in
yes)
;;
*)
EXPAT_CFLAGS="-I$expat/include"
;;
esac
;;
no)
EXPAT_CFLAGS=""
;;
*)
EXPAT_CFLAGS="-I$expat/include"
EXPAT_CFLAGS="-I$expat_includes"
;;
esac
;;
no)
EXPAT_CFLAGS=""
;;
*)
EXPAT_CFLAGS="-I$expat_includes"
;;
esac
case "$expat_lib" in
yes)
case "$expat" in
case "$expat_lib" in
yes)
EXPAT_LIBS="-lexpat"
case "$expat" in
yes)
EXPAT_LIBS="-lexpat"
;;
*)
EXPAT_LIBS="-L$expat/lib -lexpat"
;;
esac
;;
no)
;;
*)
EXPAT_LIBS="-L$expat/lib -lexpat"
EXPAT_LIBS="-L$expat_lib -lexpat"
;;
esac
;;
no)
;;
*)
EXPAT_LIBS="-L$expat_lib -lexpat"
;;
esac
expatsaved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $EXPAT_CFLAGS"
expatsaved_LIBS="$LIBS"
LIBS="$LIBS $EXPAT_LIBS"
expatsaved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $EXPAT_CFLAGS"
expatsaved_LIBS="$LIBS"
LIBS="$LIBS $EXPAT_LIBS"
AC_CHECK_HEADER(expat.h)
case "$ac_cv_header_expat_h" in
no)
AC_CHECK_HEADER(xmlparse.h)
case "$ac_cv_header_xmlparse_h" in
AC_CHECK_HEADER(expat.h)
case "$ac_cv_header_expat_h" in
no)
have_expat_header=no;
AC_CHECK_HEADER(xmlparse.h)
case "$ac_cv_header_xmlparse_h" in
no)
have_expat_header=no;
;;
yes)
HAVE_XMLPARSE_H=1
AC_SUBST(HAVE_XMLPARSE_H)
AC_DEFINE_UNQUOTED(HAVE_XMLPARSE_H,$HAVE_XMLPARSE_H,
[Use xmlparse.h instead of expat.h])
have_expat_header=yes
;;
esac
;;
yes)
HAVE_XMLPARSE_H=1
AC_SUBST(HAVE_XMLPARSE_H)
AC_DEFINE_UNQUOTED(HAVE_XMLPARSE_H,$HAVE_XMLPARSE_H,
[Use xmlparse.h instead of expat.h])
have_expat_header=yes
;;
esac
;;
yes)
have_expat_header=yes
;;
esac
case "$have_expat_header" in
no)
expat=no
;;
yes)
AC_CHECK_FUNCS(XML_SetDoctypeDeclHandler)
case "$ac_cv_func_XML_SetDoctypeDeclHandler" in
yes)
HAVE_EXPAT=1
AC_SUBST(HAVE_EXPAT)
AC_DEFINE_UNQUOTED(HAVE_EXPAT,$HAVE_EXPAT,
[Found a useable expat library])
;;
*)
case "$have_expat_header" in
no)
expat=no
;;
yes)
AC_CHECK_FUNCS(XML_SetDoctypeDeclHandler)
case "$ac_cv_func_XML_SetDoctypeDeclHandler" in
yes)
HAVE_EXPAT=1
AC_SUBST(HAVE_EXPAT)
AC_DEFINE_UNQUOTED(HAVE_EXPAT,$HAVE_EXPAT,
[Found a useable expat library])
;;
*)
expat=no
;;
esac
;;
esac
CPPFLAGS="$expatsaved_CPPFLAGS"
LIBS="$expatsaved_LIBS"
;;
esac
CPPFLAGS="$expatsaved_CPPFLAGS"
LIBS="$expatsaved_LIBS"
;;
esac
AC_SUBST(EXPAT_LIBS)
AC_SUBST(EXPAT_CFLAGS)
case "$expat" in
no)
AC_MSG_ERROR([Cannot find usable expat library. This could mean that your version is too old.])
;;
esac
AC_SUBST(EXPAT_CFLAGS)