Commit 479de06b authored by Philippe Rouquier's avatar Philippe Rouquier

Specifically link against gthread-2.0 the two libraries and brasero as they call g_thread_init ()

parent eee6e07f
...@@ -130,6 +130,7 @@ AC_SYS_LARGEFILE ...@@ -130,6 +130,7 @@ AC_SYS_LARGEFILE
dnl ********** Required libraries ********************** dnl ********** Required libraries **********************
GLIB_REQUIRED=2.15.6 GLIB_REQUIRED=2.15.6
GTHREAD_REQUIRED=2.6.0
GMODULE_REQUIRED=2.6.0 GMODULE_REQUIRED=2.6.0
GIO_REQUIRED=2.15.5 GIO_REQUIRED=2.15.5
GDK_REQUIRED=2.6.0 GDK_REQUIRED=2.6.0
...@@ -176,6 +177,13 @@ PKG_CHECK_MODULES(BRASERO_LIBUNIQUE, \ ...@@ -176,6 +177,13 @@ PKG_CHECK_MODULES(BRASERO_LIBUNIQUE, \
AC_SUBST(BRASERO_LIBUNIQUE_CFLAGS) AC_SUBST(BRASERO_LIBUNIQUE_CFLAGS)
AC_SUBST(BRASERO_LIBUNIQUE_LIBS) AC_SUBST(BRASERO_LIBUNIQUE_LIBS)
dnl ** used by brasero and both libraries
PKG_CHECK_MODULES(BRASERO_GTHREAD, \
gthread-2.0 >= $GTHREAD_REQUIRED)
AC_SUBST(BRASERO_GTHREAD_CFLAGS)
AC_SUBST(BRASERO_GTHREAD_LIBS)
dnl ** used by brasero and all modules dnl ** used by brasero and all modules
PKG_CHECK_MODULES(BRASERO_GLIB, \ PKG_CHECK_MODULES(BRASERO_GLIB, \
gobject-2.0 >= $GLIB_REQUIRED \ gobject-2.0 >= $GLIB_REQUIRED \
......
...@@ -61,6 +61,7 @@ libbrasero_burn_la_LIBADD = \ ...@@ -61,6 +61,7 @@ libbrasero_burn_la_LIBADD = \
../libbrasero-media/libbrasero-media.la \ ../libbrasero-media/libbrasero-media.la \
../libbrasero-utils/libbrasero-utils.la \ ../libbrasero-utils/libbrasero-utils.la \
$(BRASERO_GLIB_LIBS) \ $(BRASERO_GLIB_LIBS) \
$(BRASERO_GTHREAD_LIBS) \
$(BRASERO_GMODULE_LIBS) \ $(BRASERO_GMODULE_LIBS) \
$(BRASERO_GIO_LIBS) \ $(BRASERO_GIO_LIBS) \
$(BRASERO_GCONF_LIBS) \ $(BRASERO_GCONF_LIBS) \
......
...@@ -37,6 +37,7 @@ libbraseromediainclude_HEADERS = \ ...@@ -37,6 +37,7 @@ libbraseromediainclude_HEADERS = \
libbrasero_media_la_LIBADD = \ libbrasero_media_la_LIBADD = \
$(BRASERO_GLIB_LIBS) \ $(BRASERO_GLIB_LIBS) \
$(BRASERO_GTHREAD_LIBS) \
$(BRASERO_GIO_LIBS) \ $(BRASERO_GIO_LIBS) \
$(BRASERO_GTK_LIBS) \ $(BRASERO_GTK_LIBS) \
$(BRASERO_SCSI_LIBS) $(BRASERO_SCSI_LIBS)
......
...@@ -130,6 +130,7 @@ brasero_LDADD = \ ...@@ -130,6 +130,7 @@ brasero_LDADD = \
$(top_builddir)/libbrasero-burn/libbrasero-burn.la \ $(top_builddir)/libbrasero-burn/libbrasero-burn.la \
$(top_builddir)/libbrasero-utils/libbrasero-utils.la \ $(top_builddir)/libbrasero-utils/libbrasero-utils.la \
$(BRASERO_GLIB_LIBS) \ $(BRASERO_GLIB_LIBS) \
$(BRASERO_GTHREAD_LIBS) \
$(BRASERO_GIO_LIBS) \ $(BRASERO_GIO_LIBS) \
$(BRASERO_GCONF_LIBS) \ $(BRASERO_GCONF_LIBS) \
$(BRASERO_GSTREAMER_LIBS) \ $(BRASERO_GSTREAMER_LIBS) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment