diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-10-04 12:15:05 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-10-04 12:15:05 +0300 |
| commit | 370acc8b56a554f236c2f63b9057f3b5155955c4 (patch) | |
| tree | 3c812f47a49f17f16d78645621786d485d0b4432 /unittest | |
| parent | 91178418a2bfd21852ae03fbcc5a9aa4c26429c6 (diff) | |
| parent | d609fdf98beb8e22c8da42079e08e5dd1f84e16c (diff) | |
| download | mariadb-git-370acc8b56a554f236c2f63b9057f3b5155955c4.tar.gz | |
automerge
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/mysys/Makefile.am | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/unittest/mysys/Makefile.am b/unittest/mysys/Makefile.am index be91ef31c9d..f0ffc7a6720 100644 --- a/unittest/mysys/Makefile.am +++ b/unittest/mysys/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006 MySQL AB +# Copyright (C) 2009 Sun Microsystems, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,14 @@ LDADD = $(top_builddir)/unittest/mytap/libmytap.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/strings/libmystrings.a -noinst_PROGRAMS = bitmap-t base64-t my_atomic-t +noinst_PROGRAMS = bitmap-t base64-t + +if NEED_THREAD +# my_atomic-t is used to check thread functions, so it is safe to +# ignore the file in non-threaded builds. +# In fact, it will not compile without thread support. +noinst_PROGRAMS += my_atomic-t +endif # Don't update the files from bitkeeper %::SCCS/s.% |