enable munge auth by default

chkconfig --add at installation time

ChangeLog

@@ -1,3 +1,9 @@
+2011-03-20 Jim Garlick <garlick@llnl.gov>
+
+	* diod.spec.in : chkconfig --add diodctl on installation.
+
+	* diod.spec.in, config/x_ac_munge.m4 : Default munge on.
+
 2011-03-19 Jim Garlick <garlick@llnl.gov>
 
 	* : tag 1.0-pre13

config/x_ac_munge.m4

@@ -1,7 +1,7 @@
 AC_DEFUN([X_AC_MUNGE], [
   AC_ARG_ENABLE([munge],
-    [AS_HELP_STRING([--enable-munge], [Build to use MUNGE authentication])],
-    [enable_munge=$enableval], [enable_munge=no])
+    [AS_HELP_STRING([--disable-munge], [Build wout MUNGE support])],
+    [enable_munge=$enableval], [enable_munge=yes])
   if test x$enable_munge == xyes; then
     AC_CHECK_HEADERS([munge.h])
     X_AC_CHECK_COND_LIB(munge, munge_ctx_create)

configure

@@ -1420,7 +1420,7 @@ Optional Features:
 			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-munge          Build to use MUNGE authentication
+  --disable-munge         Build wout MUNGE support
   --enable-largeio        Build to use large I/O protocol extensions
 
 Some influential environment variables:
@@ -5974,7 +5974,7 @@ fi
 if test "${enable_munge+set}" = set; then
   enableval=$enable_munge; enable_munge=$enableval
 else
-  enable_munge=no
+  enable_munge=yes
 fi
 
   if test x$enable_munge == xyes; then

diod.spec

@@ -23,7 +23,7 @@ system for I/O forwarding on Linux clusters.
 %setup -q
 
 %build
-%configure --enable-munge
+%configure
 make
 
 %check
@@ -45,13 +45,13 @@ mv $RPM_BUILD_ROOT%{_mandir}/man8/diodmount.8 \
 rm -rf ${RPM_BUILD_ROOT}
 
 # %post
-# if [ -x /sbin/chkconfig ]; then /sbin/chkconfig --add diodctl; fi
+if [ -x /sbin/chkconfig ]; then /sbin/chkconfig --add diodctl; fi
 
 # %preun
-# if [ "$1" = 0 ]; then
-#   %{_sysconfdir}/init.d/diodctl stop >/dev/null 2>&1 || :
-#   if [ -x /sbin/chkconfig ]; then /sbin/chkconfig --del diodctl; fi
-# fi
+if [ "$1" = 0 ]; then
+  %{_sysconfdir}/init.d/diodctl stop >/dev/null 2>&1 || :
+  if [ -x /sbin/chkconfig ]; then /sbin/chkconfig --del diodctl; fi
+fi
 
 %files
 %defattr(-,root,root)

diod.spec.in

@@ -23,7 +23,7 @@ system for I/O forwarding on Linux clusters.
 %setup -q
 
 %build
-%configure --enable-munge
+%configure
 make
 
 %check
@@ -45,13 +45,13 @@ mv $RPM_BUILD_ROOT%{_mandir}/man8/diodmount.8 \
 rm -rf ${RPM_BUILD_ROOT}
 
 # %post
-# if [ -x /sbin/chkconfig ]; then /sbin/chkconfig --add diodctl; fi
+if [ -x /sbin/chkconfig ]; then /sbin/chkconfig --add diodctl; fi
 
 # %preun
-# if [ "$1" = 0 ]; then
-#   %{_sysconfdir}/init.d/diodctl stop >/dev/null 2>&1 || :
-#   if [ -x /sbin/chkconfig ]; then /sbin/chkconfig --del diodctl; fi
-# fi
+if [ "$1" = 0 ]; then
+  %{_sysconfdir}/init.d/diodctl stop >/dev/null 2>&1 || :
+  if [ -x /sbin/chkconfig ]; then /sbin/chkconfig --del diodctl; fi
+fi
 
 %files
 %defattr(-,root,root)