[Cvs-cvs] ccvs ChangeLog config.h.in configure configure.in

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/05/16 01:28:16

Modified files:
        .              : ChangeLog config.h.in configure configure.in 

Log message:
        * configure.in: Always set CVS_ADMIN_GROUP and set HAVE_CVS_ADMIN_GROUP
        when it will be useful.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/ChangeLog.diff?tr1=1.1300&tr2=1.1301&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/config.h.in.diff?tr1=1.199&tr2=1.200&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/configure.diff?tr1=1.449&tr2=1.450&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/configure.in.diff?tr1=1.366&tr2=1.367&r1=text&r2=text

Patches:
Index: ccvs/ChangeLog
diff -u ccvs/ChangeLog:1.1300 ccvs/ChangeLog:1.1301
--- ccvs/ChangeLog:1.1300       Mon May 15 23:10:59 2006
+++ ccvs/ChangeLog      Tue May 16 01:28:16 2006
@@ -1,3 +1,8 @@
+2006-05-16  Derek Price  <address@hidden>
+
+       * configure.in: Always set CVS_ADMIN_GROUP and set HAVE_CVS_ADMIN_GROUP
+       when it will be useful.
+
 2006-05-15  Mark D. Baushke  <address@hidden>
 
        * configure: Regenerate.
Index: ccvs/config.h.in
diff -u ccvs/config.h.in:1.199 ccvs/config.h.in:1.200
--- ccvs/config.h.in:1.199      Tue May  9 01:52:18 2006
+++ ccvs/config.h.in    Tue May 16 01:28:16 2006
@@ -174,6 +174,9 @@
 /* Define if you have the crypt function. */
 #undef HAVE_CRYPT
 
+/* Define if CVS_ADMIN_GROUP should be used. */
+#undef HAVE_CVS_ADMIN_GROUP
+
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT
Index: ccvs/configure
diff -u ccvs/configure:1.449 ccvs/configure:1.450
--- ccvs/configure:1.449        Mon May 15 23:10:37 2006
+++ ccvs/configure      Tue May 16 01:28:16 2006
@@ -44084,11 +44084,17 @@
 fi
 if test no != "$with_cvs_admin_group"; then
 
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CVS_ADMIN_GROUP 1
+_ACEOF
+
+fi
+
+
 cat >>confdefs.h <<_ACEOF
 #define CVS_ADMIN_GROUP "$with_cvs_admin_group"
 _ACEOF
 
-fi
 
 
 # Check whether --enable-cvs-ndbm or --disable-cvs-ndbm was given.
Index: ccvs/configure.in
diff -u ccvs/configure.in:1.366 ccvs/configure.in:1.367
--- ccvs/configure.in:1.366     Tue May  9 01:52:18 2006
+++ ccvs/configure.in   Tue May 16 01:28:16 2006
@@ -953,17 +953,23 @@
 fi
 if test no != "$with_cvs_admin_group"; then
   dnl FIXME We should warn if the group doesn't exist
-  AC_DEFINE_UNQUOTED(
-    [CVS_ADMIN_GROUP], ["$with_cvs_admin_group"],
-    [The CVS admin command is restricted to the members of the group
-     CVS_ADMIN_GROUP.  If this group does not exist, all users are
-     allowed to run CVS admin.  To disable the CVS admin command for
-     all users, create an empty CVS_ADMIN_GROUP by running configure
-     with the --with-cvs-admin-group= option.  To disable access control
-     for CVS admin, run configure with the --without-cvs-admin-group
-     option in order to comment out the define below.])
+  AC_DEFINE([HAVE_CVS_ADMIN_GROUP], 1,
+           [Define if CVS_ADMIN_GROUP should be used.])
 fi
 
+dnl Define this regardless to avoid #ifdefs in most of the code (error messages
+dnl that will be optimized away can still use CVS_ADMIN_GROUP without causing
+dnl build errors).
+AC_DEFINE_UNQUOTED(
+  [CVS_ADMIN_GROUP], ["$with_cvs_admin_group"],
+  [The CVS admin command is restricted to the members of the group
+   CVS_ADMIN_GROUP.  If this group does not exist, all users are
+   allowed to run CVS admin.  To disable the CVS admin command for
+   all users, create an empty CVS_ADMIN_GROUP by running configure
+   with the --with-cvs-admin-group= option.  To disable access control
+   for CVS admin, run configure with the --without-cvs-admin-group
+   option in order to comment out the define below.])
+
 dnl
 dnl Done setting CVS Administrator Group
 dnl