[Cvs-cvs] ccvs ChangeLog Makefile.in config.h.in configur...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/06/08 21:06:12

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

Log message:
        * configure.in: Substitute DEFAULT_SIGN_TEMPLATE and
        DEFAULT_SIGN_TEXTMODE in addition to #defining.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&r1=1.1309&r2=1.1310
http://cvs.savannah.gnu.org/viewcvs/ccvs/Makefile.in?cvsroot=cvs&r1=1.187&r2=1.188
http://cvs.savannah.gnu.org/viewcvs/ccvs/config.h.in?cvsroot=cvs&r1=1.200&r2=1.201
http://cvs.savannah.gnu.org/viewcvs/ccvs/configure?cvsroot=cvs&r1=1.452&r2=1.453
http://cvs.savannah.gnu.org/viewcvs/ccvs/configure.in?cvsroot=cvs&r1=1.368&r2=1.369

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.1309
retrieving revision 1.1310
diff -u -b -r1.1309 -r1.1310
--- ChangeLog   7 Jun 2006 18:43:01 -0000       1.1309
+++ ChangeLog   8 Jun 2006 21:06:12 -0000       1.1310
@@ -1,3 +1,8 @@
+2006-06-08  Derek Price  <address@hidden>
+
+       * configure.in: Substitute DEFAULT_SIGN_TEMPLATE and
+       DEFAULT_SIGN_TEXTMODE in addition to #defining.
+
 2006-06-07  Derek Price  <address@hidden>
 
        * BUGS: Remove warning about log_accum.pl.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/Makefile.in,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -b -r1.187 -r1.188
--- Makefile.in 24 Apr 2006 18:50:24 -0000      1.187
+++ Makefile.in 8 Jun 2006 21:06:12 -0000       1.188
@@ -181,6 +181,8 @@
 CPPFLAGS = @CPPFLAGS@
 CSH = @CSH@
 CYGPATH_W = @CYGPATH_W@
+DEFAULT_SIGN_TEMPLATE = @DEFAULT_SIGN_TEMPLATE@
+DEFAULT_SIGN_TEXTMODE = @DEFAULT_SIGN_TEXTMODE@
 DEFAULT_VERIFY_TEMPLATE = @DEFAULT_VERIFY_TEMPLATE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@

Index: config.h.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/config.h.in,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -b -r1.200 -r1.201
--- config.h.in 16 May 2006 01:28:16 -0000      1.200
+++ config.h.in 8 Jun 2006 21:06:12 -0000       1.201
@@ -55,8 +55,8 @@
 #undef DEFAULT_SIGN_TEMPLATE
 
 /* Define to the option string that the OpenPGP program used in the
-   DEFAULT_SIGN_TEMPLATE would like to see for text files (substituted at run
-   time in place of `%M' in the DEFAULT_SIGN_TEMPLATE). */
+   DEFAULT_SIGN_TEMPLATE & DEFAULT_VERIFY_TEMPLATE would like to see for text
+   files (substituted at run time in place of `%M' in both templates). */
 #undef DEFAULT_SIGN_TEXTMODE
 
 /* Define to a command line template that will read an OpenPGP signature from

Index: configure
===================================================================
RCS file: /cvsroot/cvs/ccvs/configure,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -b -r1.452 -r1.453
--- configure   26 May 2006 04:35:57 -0000      1.452
+++ configure   8 Jun 2006 21:06:12 -0000       1.453
@@ -327,7 +327,7 @@
 
 gl_header_list=
 gl_func_list=
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS 
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL 
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP 
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar 
am__untar ac_prefix_program MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 
RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR 
am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE 
am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S PERL CSH MKTEMP SENDMAIL 
PR GPG DEFAULT_VERIFY_TEMPLATE ROFF PS2PDF TEXI2DVI MAKE_TARGETS_IN_VPATH_TRUE 
MAKE_TARGETS_IN_VPATH_FALSE LIBOBJS GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE 
ALLOCA ALLOCA_H SYS_SOCKET_H STDBOOL_H HAVE__BOOL FNMATCH_H YACC YFLAGS 
LIB_CLOCK_GETTIME GETOPT_H GLOB_H LIB_NANOSLEEP HAVE_LONG_64BIT 
HAVE_LONG_LONG_64BIT STDINT_H UNISTD_H EOVERFLOW MKINSTALLDIRS USE_NLS MSGFMT 
GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu 
host_vendor host_os INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL 
LTLIBINTL POSUB cvs_client_objects KRB4 ZLIB_SUBDIRS ZLIB_CPPFLAGS ZLIB_LIBS 
with_default_rsh RSH_DFLT EDITOR LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS 
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL 
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP 
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar 
am__untar ac_prefix_program MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 
RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR 
am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE 
am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S PERL CSH MKTEMP SENDMAIL 
PR GPG DEFAULT_SIGN_TEMPLATE DEFAULT_SIGN_TEXTMODE DEFAULT_VERIFY_TEMPLATE ROFF 
PS2PDF TEXI2DVI MAKE_TARGETS_IN_VPATH_TRUE MAKE_TARGETS_IN_VPATH_FALSE LIBOBJS 
GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE ALLOCA ALLOCA_H SYS_SOCKET_H 
STDBOOL_H HAVE__BOOL FNMATCH_H YACC YFLAGS LIB_CLOCK_GETTIME GETOPT_H GLOB_H 
LIB_NANOSLEEP HAVE_LONG_64BIT HAVE_LONG_LONG_64BIT STDINT_H UNISTD_H EOVERFLOW 
MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu 
build_vendor build_os host host_cpu host_vendor host_os INTL_MACOSX_LIBS 
LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB cvs_client_objects KRB4 
ZLIB_SUBDIRS ZLIB_CPPFLAGS ZLIB_LIBS with_default_rsh RSH_DFLT EDITOR LTLIBOBJS'
 ac_subst_files='MKTEMP_SH_FUNCTION'
 
 # Initialize some variables set by options.
@@ -5810,14 +5810,18 @@
 _ACEOF
 
 fi
+DEFAULT_SIGN_TEMPLATE="$GPG --detach-sign --output - %M %@ -- %s"
+
 
 cat >>confdefs.h <<_ACEOF
-#define DEFAULT_SIGN_TEMPLATE "$GPG --detach-sign --output - %M %@ -- %s"
+#define DEFAULT_SIGN_TEMPLATE "$DEFAULT_SIGN_TEMPLATE"
 _ACEOF
 
+DEFAULT_SIGN_TEXTMODE=--textmode
 
-cat >>confdefs.h <<\_ACEOF
-#define DEFAULT_SIGN_TEXTMODE "--textmode"
+
+cat >>confdefs.h <<_ACEOF
+#define DEFAULT_SIGN_TEXTMODE "$DEFAULT_SIGN_TEXTMODE"
 _ACEOF
 
 DEFAULT_VERIFY_TEMPLATE="$GPG --verify %M %@ -- %S %s"
@@ -45910,6 +45914,8 @@
 s,@SENDMAIL@,$SENDMAIL,;t t
 s,@PR@,$PR,;t t
 s,@GPG@,$GPG,;t t
+s,@DEFAULT_SIGN_TEMPLATE@,$DEFAULT_SIGN_TEMPLATE,;t t
+s,@DEFAULT_SIGN_TEXTMODE@,$DEFAULT_SIGN_TEXTMODE,;t t
 s,@DEFAULT_VERIFY_TEMPLATE@,$DEFAULT_VERIFY_TEMPLATE,;t t
 s,@ROFF@,$ROFF,;t t
 s,@PS2PDF@,$PS2PDF,;t t

Index: configure.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/configure.in,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -b -r1.368 -r1.369
--- configure.in        26 May 2006 04:35:57 -0000      1.368
+++ configure.in        8 Jun 2006 21:06:12 -0000       1.369
@@ -121,18 +121,23 @@
 dnl These are defined by configure so that if the above is ever expanded to
 dnl look for OpenPGP capable programs other than `gpg', the default templates
 dnl can also be detected and substituted here.
+DEFAULT_SIGN_TEMPLATE="$GPG --detach-sign --output - %M %@ -- %s"
+AC_SUBST([DEFAULT_SIGN_TEMPLATE])
 AC_DEFINE_UNQUOTED([DEFAULT_SIGN_TEMPLATE],
-                  ["$GPG --detach-sign --output - %M %@ -- %s"],
+                  ["$DEFAULT_SIGN_TEMPLATE"],
                   [Define to a command line template that will write an
                    OpenPGP signature for the file `%s' to its standard out.
                    `%M' is substituted at run time with an option which flags
                    files as text files, when necessary, and the empty string,
                    otherwise.  `%@' is substituted with a list of arguments
                    provided by the user.])
-AC_DEFINE([DEFAULT_SIGN_TEXTMODE], ["--textmode"],
-         [Define to the option string that the OpenPGP program used in the
-          DEFAULT_SIGN_TEMPLATE would like to see for text files (substituted
-          at run time in place of `%M' in the DEFAULT_SIGN_TEMPLATE).])
+DEFAULT_SIGN_TEXTMODE=--textmode
+AC_SUBST([DEFAULT_SIGN_TEXTMODE])
+AC_DEFINE_UNQUOTED([DEFAULT_SIGN_TEXTMODE], ["$DEFAULT_SIGN_TEXTMODE"],
+                  [Define to the option string that the OpenPGP program used
+                   in the DEFAULT_SIGN_TEMPLATE & DEFAULT_VERIFY_TEMPLATE
+                   would like to see for text files (substituted at run time
+                   in place of `%M' in both templates).])
 DEFAULT_VERIFY_TEMPLATE="$GPG --verify %M %@ -- %S %s"
 AC_SUBST([DEFAULT_VERIFY_TEMPLATE])
 AC_DEFINE_UNQUOTED([DEFAULT_VERIFY_TEMPLATE],