Attachment 33676 Details for Bug 26831 – Expose private libraries if configured without shared lib

[patch] Expose private libraries if configured without shared lib

expose-prive.diff (text/plain), 1.11 KB, created by suzuki toshiya on 2010-03-01 21:28:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: suzuki toshiya

Created: 2010-03-01 21:28:14 UTC

Size: 1.11 KB

patch

obsolete

>diff --git a/configure.in b/configure.in
>index 001146d..365abff 100644
>--- a/configure.in
>+++ b/configure.in
>@@ -389,6 +389,19 @@ if test "$enable_libxml2" = "yes" -o "$expat" = "no"; then
> fi
> 
> #
>+# Setup variables for fontconfig.pc
>+#
>+if test "$enable_shared" = "no" -a "$enable_static" = "yes"; then
>+    FONTCONFIG_LIBS_EXTRA="$LIBXML2_LIBS $EXPAT_LIBS $FREETYPE_LIBS $ICONV_LIBS"
>+    FONTCONFIG_LIBS_PRIVATE=
>+else
>+    FONTCONFIG_LIBS_EXTRA=
>+    FONTCONFIG_LIBS_PRIVATE="$LIBXML2_LIBS $EXPAT_LIBS $FREETYPE_LIBS $ICONV_LIBS"
>+fi
>+AC_SUBST(FONTCONFIG_LIBS_EXTRA)
>+AC_SUBST(FONTCONFIG_LIBS_PRIVATE)
>+
>+#
> # Set default font directory
> #
> 
>diff --git a/fontconfig.pc.in b/fontconfig.pc.in
>index db55f6e..7578954 100644
>--- a/fontconfig.pc.in
>+++ b/fontconfig.pc.in
>@@ -6,6 +6,6 @@ includedir=@includedir@
> Name: Fontconfig
> Description: Font configuration and customization library
> Version: @VERSION@
>-Libs: -L${libdir} -lfontconfig
>-Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@
>+Libs: -L${libdir} -lfontconfig @FONTCONFIG_LIBS_EXTRA@
>+Libs.private: @FONTCONFIG_LIBS_PRIVATE@
> Cflags: -I${includedir}

Actions: View | Splinter Review

Attachments on bug 26831: 33676

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.