svn commit: samba r16437 - in branches/tmp/jpeach-xmetrics/source: . modules

[jpeach at samba.org]

Author: jpeach
Date: 2006-06-21 04:59:52 +0000 (Wed, 21 Jun 2006)
New Revision: 16437

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16437

Log:
Build vfs_xmetrics by default if we are profiling.

Modified:
   branches/tmp/jpeach-xmetrics/source/configure.in
   branches/tmp/jpeach-xmetrics/source/modules/vfs_xmetrics.c


Changeset:
Modified: branches/tmp/jpeach-xmetrics/source/configure.in
===================================================================
--- branches/tmp/jpeach-xmetrics/source/configure.in	2006-06-21 02:31:17 UTC (rev 16436)
+++ branches/tmp/jpeach-xmetrics/source/configure.in	2006-06-21 04:59:52 UTC (rev 16437)
@@ -5557,6 +5557,20 @@
 	samba_cv_WITH_XMETRICS=yes
 	ifXMETRICS=
 	AC_DEFINE(WITH_XMETRICS, 1, [Whether to build xmetrics profiling])
+	# Since we have decided to build xmetrics, add it as a static
+	# module, unless the user has already chosen otherwise.
+	case "$default_shared_modules" in
+	    *xmetric*)
+		;;
+	    *)
+		case "$default_static_modules" in
+		    *xmetric*) ;;
+		    *)
+			default_static_modules="${default_static_modules},vfs_xmetrics"
+			;;
+		esac
+		;;
+	esac
     fi
 
     # The Samba PMDA depends on the pmdaCache* routines that were

Modified: branches/tmp/jpeach-xmetrics/source/modules/vfs_xmetrics.c
===================================================================
--- branches/tmp/jpeach-xmetrics/source/modules/vfs_xmetrics.c	2006-06-21 02:31:17 UTC (rev 16436)
+++ branches/tmp/jpeach-xmetrics/source/modules/vfs_xmetrics.c	2006-06-21 04:59:52 UTC (rev 16437)
@@ -1575,7 +1575,7 @@
  * -------------------------------------------------------------------------
  */
 
-NTSTATUS init_module(void)
+NTSTATUS vfs_xmetrics_init(void)
 {
     NTSTATUS ret;