[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog, 1.430, 1.431 configure.ac, 1.115, 1.116

[Anton A. <ai...@de...>]

Changes by: aia21

Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv32753

Modified Files:
	ChangeLog configure.ac 
Log Message:
- mkntfs: Generate a random DCE compliant UUID for the created volume
  and include --with-uuid[=PFX] and --without-uuid options.  (Anton)
- configure.ac: Set language to C.  (Anton)
- mkntfs: Always set default cluster size to 4096 bytes regardless of
  volume size.  This is what Windows Vista does and it makes perfect
  sense from a performance point of view.  (Anton)


Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -p -r1.430 -r1.431
--- ChangeLog	9 Dec 2006 14:01:12 -0000	1.430
+++ ChangeLog	13 Dec 2006 00:11:50 -0000	1.431
@@ -106,6 +106,12 @@ xx/xx/2006 - x.xx.x - .
 	  Adapt unix_io pread()/pwrite() device operations to use pread()/
 	  pwrite() system call and adapt win32_io device operations to not
 	  supply pread()/pwrite().  (Csaba Henk, Anton)
+	- mkntfs: Generate a random DCE compliant UUID for the created volume
+	  and include --with-uuid[=PFX] and --without-uuid options.  (Anton)
+	- configure.ac: Set language to C.  (Anton)
+	- mkntfs: Always set default cluster size to 4096 bytes regardless of
+	  volume size.  This is what Windows Vista does and it makes perfect
+	  sense from a performance point of view.  (Anton)
 
 21/06/2006 - 1.13.1 - Various fixes.
 

Index: configure.ac
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- configure.ac	3 Dec 2006 14:19:29 -0000	1.115
+++ configure.ac	13 Dec 2006 00:11:50 -0000	1.116
@@ -53,6 +53,7 @@ AC_INIT([ntfsprogs],[1.13.2-WIP],[linux-
 LTVERSION_LIBNTFS="10:0:0"
 AC_SUBST(LTVERSION_LIBNTFS)
 
+AC_LANG([C])
 AC_CANONICAL_HOST([])
 AC_CANONICAL_TARGET([])
 AC_CONFIG_SRCDIR([config.h.in])
@@ -241,6 +242,42 @@ all_includes="$all_includes $USER_INCLUD
 AC_SUBST(all_includes)
 AC_SUBST(all_libraries)
 
+# Specify support for generating DCE compliant UUIDs (aka GUIDs).  We check if
+# uuid/uuid.h header is present and the uuid library is present that goes with
+# it and then check if uuid_generate() is present and usable.
+#
+# DCE UUIDs are enabled by default and can be disabled with the --disable-uuid
+# option to the configure script.
+AC_ARG_WITH(uuid, [
+  --with-uuid@<:@=PFX@:>@       generate DCE compliant UUIDs, with optional prefix
+                          to uuid library and headers @<:@default=detect@:>@
+  --without-uuid          do not generate DCE compliant UUIDs],
+	if test "$with_uuid" = "yes"; then
+		extrapath=default
+	elif test "$with_uuid" = "no"; then
+		extrapath=
+	else
+		extrapath=$with_uuid
+	fi,
+	extrapath=default
+)
+if test "x$extrapath" != "x"; then
+	if test "x$extrapath" != "xdefault"; then
+		MKNTFS_CPPFLAGS="$MKNTFS_CPPFLAGS -I$extrapath/include"
+		MKNTFS_LIBS="$MKNTFS_LIBS -L$extrapath/lib"
+	fi
+	AC_CHECK_HEADER([uuid/uuid.h],
+		AC_CHECK_LIB([uuid], [uuid_generate],
+			AC_DEFINE([ENABLE_UUID], 1,
+			[Define this to 1 if you want to enable generation of
+			DCE compliant UUIDs.])
+			MKNTFS_LIBS="$MKNTFS_LIBS -luuid",
+			AC_MSG_WARN([Linux-NTFS DCE compliant UUID generation code requires the uuid library.]),
+		),
+		AC_MSG_WARN([Linux-NTFS DCE compliant UUID generation code requires the uuid library.]),
+	)
+fi
+
 # Get compiler name
 if test ! -z "$CC"; then
 	_cc="$CC"
@@ -292,6 +329,9 @@ AC_SUBST(LIBNTFS_CFLAGS)
 AC_SUBST(LIBNTFS_GNOMEVFS_CFLAGS)
 AC_SUBST(LIBNTFS_GNOMEVFS_LIBS)
 
+AC_SUBST(MKNTFS_CPPFLAGS)
+AC_SUBST(MKNTFS_LIBS)
+
 AC_SUBST(AUTODIRS)
 
 # Checks for libraries.