[Linux-NTFS-cvs] CVS: ntfsprogs Makefile.am,1.17,1.18 configure.ac,1.75,1.76

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2005

Modified Files:
	Makefile.am configure.ac 
Log Message:
put the test code where it's more useful


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- Makefile.am	8 Aug 2005 21:20:06 -0000	1.17
+++ Makefile.am	13 Sep 2005 14:30:51 -0000	1.18
@@ -1,5 +1,5 @@
 
-SUBDIRS = doc include libntfs ntfsprogs
+SUBDIRS = doc include libntfs ntfsprogs test
 
 EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.libntfs ChangeLog \
 		INSTALL NEWS README autogen.sh ntfsprogs.spec.in \
@@ -26,3 +26,13 @@ extra:	extras
 
 extras: libs
 	(cd ntfsprogs && $(MAKE) extras) || exit 1;
+
+if ENABLE_TEST
+test:	libs
+	(cd test && $(MAKE) all test) || exit 1;
+else
+test:
+	@echo The libntfs test code has been configured out of this release.
+	@echo "./configure --enable-test" and rebuild.
+endif
+

Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- configure.ac	15 Aug 2005 20:48:48 -0000	1.75
+++ configure.ac	13 Sep 2005 14:30:52 -0000	1.76
@@ -100,6 +100,15 @@ AC_ARG_ENABLE(warnings,
 	enable_warnings=no
 )
 
+AC_ARG_ENABLE(test,
+	AS_HELP_STRING(--enable-test,compile in test code for libntfs), ,
+	enable_test=no
+)
+AM_CONDITIONAL(ENABLE_TEST, test "$enable_test" = yes)
+if test "$enable_test" = "yes"; then
+	CFLAGS="$CFLAGS -DNTFS_TEST"
+fi
+
 # Use GNU extensions if available.
 AC_GNU_SOURCE
 
@@ -305,5 +314,6 @@ AC_CONFIG_FILES([
 	ntfsprogs/ntfsresize.8
 	ntfsprogs/ntfsundelete.8
 	ntfsprogs.spec
+	test/Makefile
 ])
 AC_OUTPUT