diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-20 16:53:00 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-20 16:53:00 +0000 |
| commit | 6e973f9f133979796ca35d275470255271f39fce (patch) | |
| tree | d2ea3c36dda5d95b6e52b831daab6cbfb1dd1fd3 /xorg-server/test/Makefile.am | |
| parent | f42328963ef48163c38adf72c067078eaa717cff (diff) | |
| parent | eca5dee9e7a8dea1edba4d10b60444ac0e884139 (diff) | |
| download | vcxsrv-6e973f9f133979796ca35d275470255271f39fce.tar.gz vcxsrv-6e973f9f133979796ca35d275470255271f39fce.tar.bz2 vcxsrv-6e973f9f133979796ca35d275470255271f39fce.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/test/Makefile.am')
| -rw-r--r-- | xorg-server/test/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am index d93c7a223..ea886a961 100644 --- a/xorg-server/test/Makefile.am +++ b/xorg-server/test/Makefile.am @@ -1,4 +1,6 @@ -if UNITTESTS
+if ENABLE_UNIT_TESTS
+if HAVE_GLIB
+if HAVE_LD_WRAP
SUBDIRS= . xi2
check_PROGRAMS = xkb input xtest list
check_LTLIBRARIES = libxservertest.la
@@ -35,6 +37,8 @@ libxservertest_la_LIBADD = \ $(top_builddir)/os/libos.la \
@XORG_LIBS@
endif
+endif
+endif
CLEANFILES=libxservertest.c
|