forked from pool/gparted
572aea0253
Fix build against new glib (forwarded request 99255 from vuntz) OBS-URL: https://build.opensuse.org/request/show/99259 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gparted?expand=0&rev=4
45 lines
1.1 KiB
Diff
45 lines
1.1 KiB
Diff
commit e1df6dbb31c5a1f6f8cda97503cf77cf1be3e33c
|
|
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
|
|
|
|
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)
|
|
|