Use libxml2 if requested (with --enable-libxml2) or if expat is not

[fontconfig.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a30604e763770a65046d6c259f762a75813f33e3..db2d8ef5cfc7f4203b2ff9239788cb5aceb9981f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,26 @@
+#
+# $Id$
+#
+# Copyright © 2003 Keith Packard
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of Keith Packard not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission.  Keith Packard makes no
+# representations about the suitability of this software for any purpose.  It
+# is provided "as is" without express or implied warranty.
+#
+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
 if OS_WIN32
 
 no_undefined = -no-undefined
@@ -7,7 +30,7 @@ export_symbols = -export-symbols fontconfig.def
 
 install-libtool-import-lib: 
        $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)
-       $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/glib-2.0.def
+       $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
 
 uninstall-libtool-import-lib:
        -rm $(DESTDIR)$(libdir)/libfontconfig.dll.a $(DESTDIR)$(libdir)/fontconfig.def
@@ -43,7 +66,9 @@ endif
 
 INCLUDES =                                             \
        $(FREETYPE_CFLAGS)                              \
+       $(LIBXML2_CFLAGS)                               \
        $(EXPAT_CFLAGS)                                 \
+       $(WARN_CFLAGS)                                  \
        -DFONTCONFIG_PATH='"$(CONFDIR)"'                \
        -I$(top_srcdir)                                 \
        -I$(top_srcdir)/src
@@ -78,7 +103,7 @@ lib_LTLIBRARIES = libfontconfig.la
 libfontconfig_la_LDFLAGS =                     \
        -version-info @LT_VERSION_INFO@ $(no_undefined) $(export_symbols)
 
-libfontconfig_la_LIBADD = $(FREETYPE_LIBS) $(EXPAT_LIBS)
+libfontconfig_la_LIBADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS)
 
 install-data-local: install-ms-import-lib install-libtool-import-lib