[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/09 01:52:18

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

Log message:
        * configure.in: s/%a/%@/ & s/%t/%M/ for sign/verify templates.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/ChangeLog.diff?tr1=1.1296&tr2=1.1297&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/config.h.in.diff?tr1=1.198&tr2=1.199&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/configure.diff?tr1=1.446&tr2=1.447&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/configure.in.diff?tr1=1.365&tr2=1.366&r1=text&r2=text

Patches:
Index: ccvs/ChangeLog
diff -u ccvs/ChangeLog:1.1296 ccvs/ChangeLog:1.1297
--- ccvs/ChangeLog:1.1296       Thu Apr 27 18:42:25 2006
+++ ccvs/ChangeLog      Tue May  9 01:52:18 2006
@@ -1,3 +1,7 @@
+2006-05-08  Derek Price  <address@hidden>
+
+       * configure.in: s/%a/%@/ & s/%t/%M/ for sign/verify templates.
+
 2006-04-27  Derek Price  <address@hidden>
 
        * NEWS: Note that GSSAPI builds under HP-UX.
Index: ccvs/config.h.in
diff -u ccvs/config.h.in:1.198 ccvs/config.h.in:1.199
--- ccvs/config.h.in:1.198      Tue Apr 25 20:02:45 2006
+++ ccvs/config.h.in    Tue May  9 01:52:18 2006
@@ -48,21 +48,21 @@
 #undef C_ALLOCA
 
 /* Define to a command line template that will write an OpenPGP signature for
-   the file `%s' to its standard out. `%t' is substituted at run time with an
+   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. `%a' is substituted with a list of arguments provided by
+   string, otherwise. `%@' is substituted with a list of arguments provided by
    the user. */
 #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 `%t' in the DEFAULT_SIGN_TEMPLATE). */
+   time in place of `%M' in the DEFAULT_SIGN_TEMPLATE). */
 #undef DEFAULT_SIGN_TEXTMODE
 
 /* Define to a command line template that will read an OpenPGP signature from
-   the file `%s' and use it to verify the integrity of the file `%d'. `%t' is
+   the file `%s' and use it to verify the integrity of the file `%d'. `%M' is
    substituted at run time with an option which flags files as text files,
-   when necessary, and the empty string, otherwise. `%a' is substituted with a
+   when necessary, and the empty string, otherwise. `%@' is substituted with a
    list of arguments provided by the user. */
 #undef DEFAULT_VERIFY_TEMPLATE
 
Index: ccvs/configure
diff -u ccvs/configure:1.446 ccvs/configure:1.447
--- ccvs/configure:1.446        Thu Apr 27 18:42:25 2006
+++ ccvs/configure      Tue May  9 01:52:18 2006
@@ -5811,7 +5811,7 @@
 fi
 
 cat >>confdefs.h <<_ACEOF
-#define DEFAULT_SIGN_TEMPLATE "$GPG --detach-sign --output - %t %a -- %s"
+#define DEFAULT_SIGN_TEMPLATE "$GPG --detach-sign --output - %M %@ -- %s"
 _ACEOF
 
 
@@ -5819,7 +5819,7 @@
 #define DEFAULT_SIGN_TEXTMODE "--textmode"
 _ACEOF
 
-DEFAULT_VERIFY_TEMPLATE="$GPG --verify %t %a -- %S %s"
+DEFAULT_VERIFY_TEMPLATE="$GPG --verify %M %@ -- %S %s"
 
 
 cat >>confdefs.h <<_ACEOF
Index: ccvs/configure.in
diff -u ccvs/configure.in:1.365 ccvs/configure.in:1.366
--- ccvs/configure.in:1.365     Tue Apr 25 20:02:45 2006
+++ ccvs/configure.in   Tue May  9 01:52:18 2006
@@ -122,26 +122,26 @@
 dnl look for OpenPGP capable programs other than `gpg', the default templates
 dnl can also be detected and substituted here.
 AC_DEFINE_UNQUOTED([DEFAULT_SIGN_TEMPLATE],
-                  ["$GPG --detach-sign --output - %t %a -- %s"],
+                  ["$GPG --detach-sign --output - %M %@ -- %s"],
                   [Define to a command line template that will write an
                    OpenPGP signature for the file `%s' to its standard out.
-                   `%t' is substituted at run time with an option which flags
+                   `%M' is substituted at run time with an option which flags
                    files as text files, when necessary, and the empty string,
-                   otherwise.  `%a' is substituted with a list of arguments
+                   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 `%t' in the DEFAULT_SIGN_TEMPLATE).])
-DEFAULT_VERIFY_TEMPLATE="$GPG --verify %t %a -- %S %s"
+          at run time in place of `%M' in the DEFAULT_SIGN_TEMPLATE).])
+DEFAULT_VERIFY_TEMPLATE="$GPG --verify %M %@ -- %S %s"
 AC_SUBST([DEFAULT_VERIFY_TEMPLATE])
 AC_DEFINE_UNQUOTED([DEFAULT_VERIFY_TEMPLATE],
                   ["$DEFAULT_VERIFY_TEMPLATE"],
                   [Define to a command line template that will read an
                    OpenPGP signature from the file `%s' and use it to verify
-                   the integrity of the file `%d'.  `%t' is substituted at run
+                   the integrity of the file `%d'.  `%M' is substituted at run
                    time with an option which flags files as text files, when
-                   necessary, and the empty string, otherwise.  `%a' is
+                   necessary, and the empty string, otherwise.  `%@' is
                    substituted with a list of arguments provided by the
                    user.])