build: Correctly link to gthread

https://bugzilla.gnome.org/show_bug.cgi?id=667412
This commit is contained in:
Vincent Untz 2012-01-06 15:23:43 +01:00 committed by Curtis Gedak
parent 18f863151c
commit e52384b258
2 changed files with 8 additions and 2 deletions

View File

@ -180,6 +180,11 @@ int main ()
LIBS="$LIBS_save" LIBS="$LIBS_save"
dnl gthread
PKG_CHECK_MODULES([GTHREAD], [gthread-2.0])
AC_SUBST([GTHREAD_LIBS])
AC_SUBST([GTHREAD_CFLAGS])
dnl GTKMM dnl GTKMM
PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 > 2.8]) PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 > 2.8])
AC_SUBST([GTKMM_LIBS]) AC_SUBST([GTKMM_LIBS])

View File

@ -1,4 +1,5 @@
INCLUDES = \ INCLUDES = \
$(GTHREAD_CFLAGS) \
$(GTKMM_CFLAGS) \ $(GTKMM_CFLAGS) \
-DGPARTED_DATADIR=\""$(datadir)"\" \ -DGPARTED_DATADIR=\""$(datadir)"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
@ -64,7 +65,7 @@ gpartedbin_SOURCES = \
ufs.cc \ ufs.cc \
xfs.cc xfs.cc
gpartedbin_LDFLAGS = -lparted -lgthread-2.0 gpartedbin_LDFLAGS = -lparted
gpartedbin_LDADD = $(GTKMM_LIBS) gpartedbin_LDADD = $(GTHREAD_LIBS) $(GTKMM_LIBS)