| 1 |
Author: fwang |
| 2 |
Subject: Build fix: Fix linking of headers |
| 3 |
Applied-Upstream: commit:30629 |
| 4 |
Forwarded: yes |
| 5 |
Bug: http://bugzilla.abisource.com/show_bug.cgi?id=13256 |
| 6 |
|
| 7 |
--- configure.in.link 2011-11-12 22:48:23.000000000 +0800 |
| 8 |
+++ configure.in 2012-01-31 02:59:11.487363176 +0800 |
| 9 |
@@ -103,7 +103,7 @@ |
| 10 |
opt_pkgs='' |
| 11 |
|
| 12 |
# gtk deps |
| 13 |
-cairo_req='cairo-pdf cairo-ps pangocairo' |
| 14 |
+cairo_req='cairo-pdf cairo-ps pangocairo cairo-fc' |
| 15 |
if test "x$abi_cv_gtk2" = "xyes"; then |
| 16 |
gtk_req="gtk+-2.0 >= $GTK2_VERSION_REQ gtk+-unix-print-2.0 librsvg-2.0 >= 2.16.0" |
| 17 |
else |
| 18 |
@@ -608,10 +608,13 @@ |
| 19 |
SYSTEM_LIBS="-framework Cocoa" |
| 20 |
AC_CHECK_PROG([CONVERT], [convert], convert, AC_MSG_ERROR(Cannot find ImageMagick convert)) |
| 21 |
else |
| 22 |
- deps_pkgs="$deps_pkgs $gtk_pkgs" |
| 23 |
+ SYSTEM_CFLAGS=$PNG_CFLAGS |
| 24 |
+ SYSTEM_LIBS=$PNG_LIBS |
| 25 |
+ deps_pkgs="$deps_pkgs $gtk_pkgs x11" |
| 26 |
fi |
| 27 |
|
| 28 |
PKG_CHECK_MODULES(DEPS,[$deps_pkgs]) |
| 29 |
+DEPS_LIBS=`$PKG_CONFIG --libs-only-L --libs-only-l $deps_pkgs` |
| 30 |
dnl specific gtk214 test. |
| 31 |
if test "$TOOLKIT" = "gtk2"; then |
| 32 |
PKG_CHECK_MODULES(GTK214, gtk+-2.0 > 2.14, [abi_cv_gtk214=yes], |
| 33 |
--- src/Makefile.am.link 2011-11-09 01:53:10.000000000 +0800 |
| 34 |
+++ src/Makefile.am 2012-01-31 03:10:13.187362481 +0800 |
| 35 |
@@ -47,10 +47,9 @@ |
| 36 |
-DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\"" |
| 37 |
|
| 38 |
libabiword_@ABIWORD_SERIES@_la_LDFLAGS = \ |
| 39 |
- $(DEPS_LIBS) \ |
| 40 |
- -no-undefined \ |
| 41 |
+ -Wl, --no-undefined \ |
| 42 |
-avoid-version \ |
| 43 |
- -export-dynamic |
| 44 |
+ -Wl, --export-dynamic |
| 45 |
|
| 46 |
|
| 47 |
if TOOLKIT_COCOA |
| 48 |
@@ -58,7 +57,6 @@ |
| 49 |
endif |
| 50 |
|
| 51 |
libabiword_@ABIWORD_SERIES@_la_LIBADD = \ |
| 52 |
- $(opt_libs) \ |
| 53 |
plugins/libplugins.la \ |
| 54 |
text/fmt/xp/libxp.la \ |
| 55 |
text/ptbl/xp/libxp.la \ |
| 56 |
@@ -72,7 +70,8 @@ |
| 57 |
af/util/$(PLATFORM)/lib$(PLATFORM).la \ |
| 58 |
af/util/xp/libxp.la \ |
| 59 |
af/ev/$(TOOLKIT)/lib$(TOOLKIT).la \ |
| 60 |
- af/ev/xp/libxp.la |
| 61 |
+ af/ev/xp/libxp.la \ |
| 62 |
+ $(opt_libs) $(DEPS_LIBS) |
| 63 |
|
| 64 |
if TOOLKIT_GTK_ALL |
| 65 |
libabiword_@ABIWORD_SERIES@_la_LIBADD += \ |
| 66 |
@@ -114,14 +113,14 @@ |
| 67 |
$(libabiword_@ABIWORD_SERIES@_la_CPPFLAGS) |
| 68 |
|
| 69 |
AbiWord_LDFLAGS = \ |
| 70 |
- $(DEPS_LIBS) \ |
| 71 |
- -no-undefined \ |
| 72 |
+ -Wl, --no-undefined \ |
| 73 |
-avoid-version \ |
| 74 |
- -export-dynamic \ |
| 75 |
+ -Wl, --export-dynamic \ |
| 76 |
-headerpad_max_install_names |
| 77 |
|
| 78 |
AbiWord_LDADD = \ |
| 79 |
- libabiword-@ABIWORD_SERIES@.la |
| 80 |
+ libabiword-@ABIWORD_SERIES@.la \ |
| 81 |
+ $(DEPS_LIBS) |
| 82 |
|
| 83 |
AbiWord_SOURCES = \ |
| 84 |
$(main_cpp) |
Parent Directory
| 
Revision Log