Mercurial > mxe-octave
view src/graphicsmagick-1-fix-xml2-config.patch @ 2858:7c6b29399d05
New script to make shared libraries from static libraries. This
script should only be used as a temporary solution for those packages
which do not have Makefiles that can be easily fixed to generate
shared libraries. It would be better to fix the build systems of
these libraries to correctly generate shared libraries using CMake or
autotools.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 15 Nov 2012 16:14:26 -0500 |
parents | c9b15d4d4f7d |
children | fb311137f2f4 |
line wrap: on
line source
This file is part of MXE. See index.html for further information. This patch has been taken from: http://sourceforge.net/tracker/?func=detail&aid=3130497&group_id=73485&atid=537937 diff --git a/configure.ac b/configure.ac index 979d2c4..12d4555 100755 --- a/configure.ac +++ b/configure.ac @@ -2373,12 +2373,13 @@ then # Debian installs libxml headers under /usr/include/libxml2/libxml with # the shared library installed under /usr/lib, whereas the package # installs itself under $prefix/libxml and $prefix/lib. - xml2_prefix=`xml2-config --prefix` + xml2_prefix=`"$xml2_config" --prefix` if test -d "${xml2_prefix}/include/libxml2" then CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2" fi LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib" + LIBS="$LIBS `"$xml2_config" --libs`" fi failed=0 passed=0 @@ -2401,8 +2402,9 @@ then LDFLAGS="$OLD_LDFLAGS" CPPFLAGS="$OLD_CPPFLAGS" else - LIB_XML='-lxml2' + LIB_XML=`"$xml2_config" --libs` LIBS="$LIB_XML $LIBS" + CPPFLAGS="$CPPFLAGS `"$xml2_config" --cflags`" AC_DEFINE(HasXML,1,Define if you have XML library) AC_MSG_RESULT(yes) have_xml='yes' diff --git a/magick/GraphicsMagick.pc.in b/magick/GraphicsMagick.pc.in index 5757b37..87e3fd4 100644 --- a/magick/GraphicsMagick.pc.in +++ b/magick/GraphicsMagick.pc.in @@ -8,4 +8,6 @@ Name: GraphicsMagick Version: @PACKAGE_VERSION@ Description: GraphicsMagick image processing library +Requires.private: libxml-2.0 Libs: -L${libdir} -lGraphicsMagick +Libs.private: @MAGICK_API_LDFLAGS@ @MAGICK_API_LIBS@ Cflags: -I${includedir} @MAGICK_API_PC_CPPFLAGS@