Skip to content

Commit

Permalink
Fix checking when libgdi is configured as "sibling"
Browse files Browse the repository at this point in the history
When libgdiplus is configured as sibling, it is available in the
libgdiplus_loc path. This path was added to runtime/mono/config, but
it was later overridden by the prefix-based path.

Using the same approach as for libMonoPosixHelper fixed the lookup of
the library (performed, for example, when testing
MonoTests.System.Drawing without installing libgdiplus).

This change is released under the MIT license.
  • Loading branch information
ranma42 committed May 21, 2014
1 parent 3598b33 commit c9304c4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion runtime/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ etc/mono/config: ../data/config Makefile $(symlinks)
d=`cd ../support && pwd`; \
sed 's,target="libMonoPosixHelper[^"]*",target="'$$d/libMonoPosixHelper.la'",' ../data/config > $@t
if test -z "$(libgdiplus_loc)"; then :; else \
sed 's,<configuration>,& <dllmap dll="gdiplus.dll" target="$(libgdiplus_loc)" os="!windows"/>,' $@t > $@tt; \
sed 's,target="[^"]*libgdiplus[^"]*",target="$(libgdiplus_loc)",' $@t > $@tt; \
mv -f $@tt $@t; fi
mv -f $@t $@

Expand Down

0 comments on commit c9304c4

Please sign in to comment.