projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
94e13c7
)
Prevent an invalid @CARBON_LIBS@ from appearing in the .pc files
author
Erik van Pienbroek
<epienbro@fedoraproject.org>
Sat, 14 Jun 2014 15:10:17 +0000
(17:10 +0200)
committer
Colin Walters
<walters@verbum.org>
Sat, 14 Jun 2014 18:21:37 +0000
(14:21 -0400)
Fixes static linking when using the glib pkgconfig file.
Regression was introduced in commit 8d037c6 (bz #668152)
https://bugzilla.gnome.org/show_bug.cgi?id=731657
configure.ac
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index
6ede842
..
6b6ab55
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-217,6
+217,8
@@
AS_IF([test "x$glib_have_carbon" = "xyes"], [
LDFLAGS="$LDFLAGS $CARBON_LIBS"
], [CARBON_LIBS=""])
+AC_SUBST([CARBON_LIBS])
+
AS_IF([test "x$glib_have_cocoa" = "xyes"], [
AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
COCOA_LIBS="-Wl,-framework,Foundation"