Index: trunk/psLib/test/astro/Makefile.am
===================================================================
--- trunk/psLib/test/astro/Makefile.am	(revision 8840)
+++ trunk/psLib/test/astro/Makefile.am	(revision 8841)
@@ -13,5 +13,12 @@
 	test.ser7.dat
 
-check_PROGRAMS =
+TEST_PROGS =
+
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+TESTS = $(TEST_PROGS)
 
 CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
Index: trunk/psLib/test/db/Makefile.am
===================================================================
--- trunk/psLib/test/db/Makefile.am	(revision 8840)
+++ trunk/psLib/test/db/Makefile.am	(revision 8841)
@@ -5,5 +5,12 @@
 	$(PSLIB_LIBS)
 
-check_PROGRAMS = 
+TEST_PROGS = 
+
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+TESTS = $(TEST_PROGS)
 
 CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
Index: trunk/psLib/test/fft/Makefile.am
===================================================================
--- trunk/psLib/test/fft/Makefile.am	(revision 8840)
+++ trunk/psLib/test/fft/Makefile.am	(revision 8841)
@@ -5,5 +5,12 @@
 	$(PSLIB_LIBS)
 
-check_PROGRAMS =
+TEST_PROGS =
+
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+TESTS = $(TEST_PROGS)
 
 CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
Index: trunk/psLib/test/fits/Makefile.am
===================================================================
--- trunk/psLib/test/fits/Makefile.am	(revision 8840)
+++ trunk/psLib/test/fits/Makefile.am	(revision 8841)
@@ -5,5 +5,12 @@
 	$(PSLIB_LIBS)
 
-check_PROGRAMS =
+TEST_PROGS =
+
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+TESTS = $(TEST_PROGS)
 
 CLEANFILES = $(check_DATA) temp/* multi.fits table.fits tmpImages/* core core.* *~ \
Index: trunk/psLib/test/imageops/Makefile.am
===================================================================
--- trunk/psLib/test/imageops/Makefile.am	(revision 8840)
+++ trunk/psLib/test/imageops/Makefile.am	(revision 8841)
@@ -5,5 +5,12 @@
 	$(PSLIB_LIBS)
 
-check_PROGRAMS =
+TEST_PROGS =
+
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+TESTS = $(TEST_PROGS)
 
 CLEANFILES = $(check_DATA) temp/* fOut.fits sOut.fits fBiOut.fits sBiOut.fits \
Index: trunk/psLib/test/jpeg/Makefile.am
===================================================================
--- trunk/psLib/test/jpeg/Makefile.am	(revision 8840)
+++ trunk/psLib/test/jpeg/Makefile.am	(revision 8841)
@@ -5,5 +5,12 @@
 	$(PSLIB_LIBS)
 
-check_PROGRAMS =
+TEST_PROGS =
+
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+TESTS = $(TEST_PROGS)
 
 CLEANFILES = $(check_DATA) core core.* *~ *.bb *.bbg *.da gmon.out
Index: trunk/psLib/test/math/Makefile.am
===================================================================
--- trunk/psLib/test/math/Makefile.am	(revision 8840)
+++ trunk/psLib/test/math/Makefile.am	(revision 8841)
@@ -5,5 +5,12 @@
 	$(PSLIB_LIBS)
 
-check_PROGRAMS =
+TEST_PROGS =
+
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+TESTS = $(TEST_PROGS)
 
 CLEANFILES = $(check_DATA) temp/* seed_msglog1.txt core core.* *~ *.bb *.bbg *.da gmon.out
Index: trunk/psLib/test/mathtypes/Makefile.am
===================================================================
--- trunk/psLib/test/mathtypes/Makefile.am	(revision 8840)
+++ trunk/psLib/test/mathtypes/Makefile.am	(revision 8841)
@@ -10,6 +10,13 @@
 	$(PSLIB_LIBS)
 
-check_PROGRAMS = \
+TEST_PROGS = \
 	tap_psVector
+
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+TESTS = $(TEST_PROGS)
 
 CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
Index: trunk/psLib/test/mathtypes/tap_psVector.c
===================================================================
--- trunk/psLib/test/mathtypes/tap_psVector.c	(revision 8840)
+++ trunk/psLib/test/mathtypes/tap_psVector.c	(revision 8841)
@@ -1,3 +1,4 @@
 #include <stdio.h>
+#include <string.h>
 #include <pslib.h>
 
Index: trunk/psLib/test/pstap/src/Makefile.am
===================================================================
--- trunk/psLib/test/pstap/src/Makefile.am	(revision 8840)
+++ trunk/psLib/test/pstap/src/Makefile.am	(revision 8841)
@@ -5,6 +5,12 @@
 	$(PSLIB_LIBS)
 
+TEST_LTLIBS = libpstap.la
+libpstap_la_SOURCES = pstap.c
 noinst_HEADERS = pstap.h
-check_LTLIBRARIES = libpstap.la
 
-libpstap_la_SOURCES = pstap.c
+if BUILD_TESTS
+lib_LTLIBRARIES = $(TEST_LTLIBS)
+else
+check_LTLIBRARIES = $(TEST_LTLIBS)
+endif
+
Index: trunk/psLib/test/sys/Makefile.am
===================================================================
--- trunk/psLib/test/sys/Makefile.am	(revision 8840)
+++ trunk/psLib/test/sys/Makefile.am	(revision 8841)
@@ -10,7 +10,13 @@
 	$(PSLIB_LIBS)
 
+TEST_PROGS = \
+	tap_psStringSubstitute
 
-check_PROGRAMS = \
-	tap_psStringSubstitute
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+TESTS = $(TEST_PROGS)
 
 CLEANFILES = $(check_DATA) temp/* log.txt log2.txt test.fits tst_psTrace02_OUT \
Index: trunk/psLib/test/sys/tap_psStringSubstitute.c
===================================================================
--- trunk/psLib/test/sys/tap_psStringSubstitute.c	(revision 8840)
+++ trunk/psLib/test/sys/tap_psStringSubstitute.c	(revision 8841)
@@ -1,3 +1,4 @@
 #include <stdio.h>
+#include <string.h>
 #include <pslib.h>
 
Index: trunk/psLib/test/tap/configure.in
===================================================================
--- trunk/psLib/test/tap/configure.in	(revision 8840)
+++ trunk/psLib/test/tap/configure.in	(revision 8841)
@@ -17,4 +17,12 @@
 		;;
 esac
+
+dnl build tests at the same time as the source code
+AC_ARG_ENABLE(tests,
+  [AS_HELP_STRING(--enable-tests,build tests at same time as source)],
+  [AC_MSG_RESULT(test building enabled)
+   tests=true],
+   [tests=false])
+AM_CONDITIONAL(BUILD_TESTS, test x$tests = xtrue)
 
 # Checks for header files
Index: trunk/psLib/test/tap/src/Makefile.am
===================================================================
--- trunk/psLib/test/tap/src/Makefile.am	(revision 8840)
+++ trunk/psLib/test/tap/src/Makefile.am	(revision 8841)
@@ -1,7 +1,13 @@
-check_LTLIBRARIES = libtap.la
+TEST_LTLIBS = libtap.la
 libtap_la_SOURCES = tap.c tap.h
+include_HEADERS = tap.h
+
+if BUILD_TESTS
+lib_LTLIBRARIES = $(TEST_LTLIBS)
+else
+check_LTLIBRARIES = $(TEST_LTLIBS)
+endif
 
 man_MANS = tap.3
 EXTRA_DIST = $(man_MANS)
 
-include_HEADERS = tap.h
Index: trunk/psLib/test/types/Makefile.am
===================================================================
--- trunk/psLib/test/types/Makefile.am	(revision 8840)
+++ trunk/psLib/test/types/Makefile.am	(revision 8841)
@@ -11,5 +11,5 @@
 AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""
 
-check_PROGRAMS = \
+TEST_PROGS = \
 	tap_psMetadataIterator \
 	tap_psListIterator \
@@ -25,4 +25,11 @@
 	tap_psArray_all \
 	tap_psArguments_all
+
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+TESTS = $(TEST_PROGS)
 
 check_DATA = \
Index: trunk/psLib/test/types/tap_psListIterator.c
===================================================================
--- trunk/psLib/test/types/tap_psListIterator.c	(revision 8840)
+++ trunk/psLib/test/types/tap_psListIterator.c	(revision 8841)
@@ -1,3 +1,4 @@
 #include <stdio.h>
+#include <string.h>
 #include <pslib.h>
 
Index: trunk/psLib/test/types/tap_psMetadataConfigRead.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadataConfigRead.c	(revision 8840)
+++ trunk/psLib/test/types/tap_psMetadataConfigRead.c	(revision 8841)
@@ -1,3 +1,4 @@
 #include <stdio.h>
+#include <string.h>
 #include <pslib.h>
 
Index: trunk/psLib/test/types/tap_psMetadataItemParse.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadataItemParse.c	(revision 8840)
+++ trunk/psLib/test/types/tap_psMetadataItemParse.c	(revision 8841)
@@ -1,3 +1,4 @@
 #include <pslib.h>
+#include <string.h>
 
 #include "tap.h"
Index: trunk/psLib/test/types/tap_psMetadataIterator.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadataIterator.c	(revision 8840)
+++ trunk/psLib/test/types/tap_psMetadataIterator.c	(revision 8841)
@@ -1,3 +1,4 @@
 #include <stdio.h>
+#include <string.h>
 #include <pslib.h>
 
Index: trunk/psLib/test/types/tap_psMetadata_copying.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadata_copying.c	(revision 8840)
+++ trunk/psLib/test/types/tap_psMetadata_copying.c	(revision 8841)
@@ -12,4 +12,5 @@
 
 #include <pslib.h>
+#include <string.h>
 
 #include "tap.h"
Index: trunk/psLib/test/types/tap_psMetadata_creating.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadata_creating.c	(revision 8840)
+++ trunk/psLib/test/types/tap_psMetadata_creating.c	(revision 8841)
@@ -14,4 +14,5 @@
 
 #include <pslib.h>
+#include <string.h>
 
 #include "tap.h"
Index: trunk/psLib/test/types/tap_psMetadata_manip.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadata_manip.c	(revision 8840)
+++ trunk/psLib/test/types/tap_psMetadata_manip.c	(revision 8841)
@@ -12,4 +12,5 @@
 
 #include <pslib.h>
+#include <string.h>
 
 #include "tap.h"
Index: trunk/psLib/test/types/tap_psMetadata_polynomials.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadata_polynomials.c	(revision 8840)
+++ trunk/psLib/test/types/tap_psMetadata_polynomials.c	(revision 8841)
@@ -12,4 +12,5 @@
 
 #include <pslib.h>
+#include <string.h>
 
 #include "tap.h"
Index: trunk/psLib/test/types/tap_psMetadata_printing.c
===================================================================
--- trunk/psLib/test/types/tap_psMetadata_printing.c	(revision 8840)
+++ trunk/psLib/test/types/tap_psMetadata_printing.c	(revision 8841)
@@ -11,4 +11,6 @@
  */
 
+#include <stdio.h>
+#include <string.h>
 #include <fcntl.h>
 #include <pslib.h>
Index: trunk/psLib/test/xml/Makefile.am
===================================================================
--- trunk/psLib/test/xml/Makefile.am	(revision 8840)
+++ trunk/psLib/test/xml/Makefile.am	(revision 8841)
@@ -5,5 +5,12 @@
 	$(PSLIB_LIBS)
 
-check_PROGRAMS =
+TEST_PROGS = 
+
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+TESTS = $(TEST_PROGS)
 
 EXTRA_DIST = psTime.xml psTime2.xml psTime3.xml psTime4.xml