[gparted] build: Correctly link to gthread
- From: Curtis Gedak <gedakc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gparted] build: Correctly link to gthread
- Date: Fri, 6 Jan 2012 20:06:19 +0000 (UTC)
commit e52384b258c29c83d972a977b86df036ae548cce
Author: Vincent Untz <vuntz gnome org>
Date: Fri Jan 6 15:23:43 2012 +0100
build: Correctly link to gthread
https://bugzilla.gnome.org/show_bug.cgi?id=667412
configure.in | 5 +++++
src/Makefile.am | 5 +++--
2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index b44584a..774192a 100644
--- a/configure.in
+++ b/configure.in
@@ -180,6 +180,11 @@ int main ()
LIBS="$LIBS_save"
+dnl gthread
+PKG_CHECK_MODULES([GTHREAD], [gthread-2.0])
+AC_SUBST([GTHREAD_LIBS])
+AC_SUBST([GTHREAD_CFLAGS])
+
dnl GTKMM
PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 > 2.8])
AC_SUBST([GTKMM_LIBS])
diff --git a/src/Makefile.am b/src/Makefile.am
index f3f5cf6..d3b0b5d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
INCLUDES = \
+ $(GTHREAD_CFLAGS) \
$(GTKMM_CFLAGS) \
-DGPARTED_DATADIR=\""$(datadir)"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
@@ -64,7 +65,7 @@ gpartedbin_SOURCES = \
ufs.cc \
xfs.cc
-gpartedbin_LDFLAGS = -lparted -lgthread-2.0
+gpartedbin_LDFLAGS = -lparted
-gpartedbin_LDADD = $(GTKMM_LIBS)
+gpartedbin_LDADD = $(GTHREAD_LIBS) $(GTKMM_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]