Mercurial > mxe-octave

changeset 3128:9e26e3930422

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
libmng.mk: use ENABLE_SHARED_OR_STATIC, remove lcms deps for MSVC
author Michael Goffioul <michael.goffioul@gmail.com>
date Thu, 11 Jul 2013 23:47:33 -0400
parents e0257da7fcdc
children d24828818d36
files src/libmng.mk
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/libmng.mk	Thu Jul 11 23:47:31 2013 -0400
+++ b/src/libmng.mk	Thu Jul 11 23:47:33 2013 -0400
@@ -27,12 +27,16 @@
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
-        --enable-shared && $(CONFIGURE_POST_HOOK)
+	$(ENABLE_SHARED_OR_STATIC) \
+        && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
     $(SED) -e 's^@prefix@^$(HOST_PREFIX)^;' \
            -e 's^@VERSION@^$(libmng_VERSION)^;' \
            -e 's^@mng_libs_private@^-ljpeg^;' \
            -e 's^@mng_requires_private@^lcms zlib^;' \
            < '$(1)/libmng.pc.in' > '$(1)/libmng.pc'
+    if test x$(MXE_SYSTEM) = xmsvc; then \
+        $(SED) -i -e 's/lcms//' '$(1)/libmng.pc'; \
+    fi
     $(INSTALL) -m644 '$(1)/libmng.pc' '$(HOST_LIBDIR)/pkgconfig/'
 endef