diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-06-18 11:28:52 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-06-22 10:49:06 +1000 |
| commit | 7100118c8d3314d73bfef0a262af56686b227055 (patch) | |
| tree | f343cf9e605890239b88b676d90852ad0b28ca10 | |
| parent | 014ad46f1b353a95e2c4289443ee857cfbabb3ae (diff) | |
AC_SUBST the GLX_SYS_LIBS
libxservertest needs -lpthread from glxapi.c's pthread_once() call. Usually
this would be pulled in by the XORG_LIBS but not when building without Xorg.
This commit has no visible effect on the current tree, preparation for test
cleanups.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/xi2/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index b2a53aa64..a5a2e5c2b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -20,7 +20,7 @@ INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \ -I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \ -I$(top_srcdir)/hw/xfree86/ramdac endif -TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) +TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS) if XORG if SPECIAL_DTRACE_OBJECTS diff --git a/test/xi2/Makefile.am b/test/xi2/Makefile.am index 913ba0f8b..9de7abf5d 100644 --- a/test/xi2/Makefile.am +++ b/test/xi2/Makefile.am @@ -18,7 +18,7 @@ TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV) AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ INCLUDES = @XORG_INCS@ -TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) +TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS) COMMON_SOURCES=protocol-common.h protocol-common.c if SPECIAL_DTRACE_OBJECTS |