diff options
| author | Carlos Eduardo Rodrigues Diógenes <carlosd@src.gnome.org> | 2007-05-31 18:15:48 +0000 |
|---|---|---|
| committer | Carlos Eduardo Rodrigues Diógenes <carlosd@src.gnome.org> | 2007-05-31 18:15:48 +0000 |
| commit | d46079ed33c1040acd4582c094ac7c27ffbce290 (patch) | |
| tree | 54f69f1d7a5160d98d41c3253bef9f089ec8d8af | |
| parent | c1f8009bf64928e3f5991f2b53ddeea6a834c7e4 (diff) | |
correct link other to resolve an issue with pango (bug #442219)gnome-2-18
svn path=/branches/gnome-2-18/; revision=510
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | magnifier/Makefile.am | 7 |
2 files changed, 8 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2007-05-31 Carlos Eduardo Rodrigues Diógenes <cerdiogenes@gmail.com> + + * magnifier/Makefile.am: Fix the linker library include order so that + the linker searches the right path for pango (Fixes bug #442219). Patch + from Elijah Newren <newren@gmail.com>. + 2007-05-24 Carlos Eduardo Rodrigues Diógenes <cerdiogenes@gmail.com> * configure.in: post-release incrementing to 0.14.5. diff --git a/magnifier/Makefile.am b/magnifier/Makefile.am index 555dda0..f87ec46 100644 --- a/magnifier/Makefile.am +++ b/magnifier/Makefile.am @@ -69,11 +69,8 @@ GNOME_Magnifier_module_la_LIBADD = $(ORBIT_LIBS) GNOME_Magnifier_module_la_SOURCES = \ GNOME_Magnifier-imodule.c -# The X_LIBS must be searched first, since the DEPS_LIBS are setted by a call -# to pkg-config and can contain a path to X libraries, other way the -# functionalities finded during the test that setted X_LIBS can not be -# presented in the final link. -LDADD = $(X_LIBS) $(DEPS_LIBS) libgnome-mag.la $(POPT_LIBS) $(COLORBLIND_LIBS) +# The X_LIBS must NOT be searched first or it breaks the build +LDADD = libgnome-mag.la $(DEPS_LIBS) $(X_LIBS) $(COLORBLIND_LIBS) $(GS_OBJS) serverinfodir= $(libdir)/bonobo/servers $(server_in_files): $(server_in_files).in |