diff options
| author | Matt Turner <[email protected]> | 2012-09-18 20:22:37 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-09-27 10:25:26 -0700 |
| commit | 9ed00075d8ea0ffaa675237e32b8611ad3064dbf (patch) | |
| tree | fc1f135dfd8d9d32fcf770a46dbc36e1d54936ef | |
| parent | 7da12426f7682ffc44ae40e31d1b5712521fbb70 (diff) | |
build: Link libglapi with pthreads
NOTE: This is a candidate for the 9.0 branch.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=839060
https://bugs.gentoo.org/show_bug.cgi?id=435152
Reviewed-by: Adam Jackson <[email protected]>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/mapi/shared-glapi/Makefile.am | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 49cdb8249d0..896f98a53bb 100644 --- a/configure.ac +++ b/configure.ac @@ -524,6 +524,7 @@ if test "x$enable_selinux" = "xyes"; then SELINUX_LIBS="-lselinux" DEFINES="$DEFINES -DMESA_SELINUX" fi +AC_SUBST([SELINUX_LIBS]) dnl Options for APIs AC_ARG_ENABLE([opengl], @@ -920,10 +921,6 @@ AC_SUBST([GLESv1_CM_PC_LIB_PRIV]) AC_SUBST([GLESv2_LIB_DEPS]) AC_SUBST([GLESv2_PC_LIB_PRIV]) -GLAPI_LIB_DEPS="-lpthread $SELINUX_LIBS" -AC_SUBST([GLAPI_LIB_DEPS]) - - DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la" AC_SUBST([HAVE_XF86VIDMODE]) diff --git a/src/mapi/shared-glapi/Makefile.am b/src/mapi/shared-glapi/Makefile.am index 8db7688c034..d215c43ad95 100644 --- a/src/mapi/shared-glapi/Makefile.am +++ b/src/mapi/shared-glapi/Makefile.am @@ -6,6 +6,7 @@ include $(top_srcdir)/src/mapi/mapi/sources.mak lib_LTLIBRARIES = libglapi.la libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) +libglapi_la_LIBADD = $(PTHREAD_LIBS) $(SELINUX_LIBS) libglapi_la_LDFLAGS = -no-undefined include $(GLAPI)/gen/glapi_gen.mk @@ -15,6 +16,7 @@ glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) BUILT_SOURCES = glapi_mapi_tmp.h CLEANFILES = $(BUILT_SOURCES) +AM_CFLAGS = $(PTHREAD_CFLAGS) AM_CPPFLAGS = \ $(DEFINES) \ -I$(top_srcdir)/include \ |