GraphicsMagick: configure.ac: Search for a GnuPG 'gpg' program.

GraphicsMagick Commits <[email protected]>
Newsgroups gmane.comp.video.graphicsmagick.cvs
Message-ID <mailman.38290.1639517586.1346.graphicsmagick-commit@lists.sourceforge.net> 
changeset 662c664bba0a in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=662c664bba0a
summary: configure.ac: Search for a GnuPG 'gpg' program.

diffstat:

 ChangeLog          |   2 +
 Makefile.am        |   6 ++--
 Makefile.in        |   7 +++--
 configure          |  67 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac       |  11 +++++++-
 www/Changelog.html |   7 ++++-
 6 files changed, 88 insertions(+), 12 deletions(-)

diffs (239 lines):

diff -r 1ca97eae5e46 -r 662c664bba0a ChangeLog
--- a/ChangeLog	Tue Dec 14 14:27:30 2021 -0600
+++ b/ChangeLog	Tue Dec 14 15:32:52 2021 -0600
@@ -1,5 +1,7 @@
 2021-12-14  Bob Friesenhahn  <[email protected]>
 
+        * configure.ac: Search for a GnuPG 'gpg' program.
+
         * Makefile.am (snapshot): Add support for PGP-signed snapshots.
 
         * www/download.rst: Add documentation for how to validate
diff -r 1ca97eae5e46 -r 662c664bba0a Makefile.am
--- a/Makefile.am	Tue Dec 14 14:27:30 2021 -0600
+++ b/Makefile.am	Tue Dec 14 15:32:52 2021 -0600
@@ -392,7 +392,7 @@
 	$(MAKE) $(DIST_WINDOWS_SRC_7ZIP)
 	for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \
 	  rm -f $${file}.sig ; \
-	  gpg2 --output $${file}.sig --detach-sig $${file} ; \
+	  $(GPG) --output $${file}.sig --detach-sig $${file} ; \
 	done
 	$(GRAPHICSMAGICK_SNAPSHOT_COPY) $(SNAPSHOT_DIST_ARCHIVES) \
 	  `for f in $(SNAPSHOT_DIST_ARCHIVES) ; do printf "%s.sig " $$f ; done` \
@@ -406,7 +406,7 @@
 	$(MAKE) $(DIST_ARCHIVE_SRPM)
 	$(MAKE) $(DIST_WINDOWS_SRC_7ZIP)
 	for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \
-	  gpg2 --output $${file}.sig --detach-sig $${file} ; \
+	  $(GPG) --output $${file}.sig --detach-sig $${file} ; \
 	done
 	$(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-*.tar.*
 	$(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-*-windows.7z*
@@ -463,5 +463,5 @@
 	$(MAKE) $(DIST_WINDOWS_SRC_7ZIP)
 	for file in $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) ; do \
 	  rm -f $${file}.sig ; \
-	  gpg2 --output $${file}.sig --detach-sig $${file} ; \
+	  $(GPG) --output $${file}.sig --detach-sig $${file} ; \
 	done
diff -r 1ca97eae5e46 -r 662c664bba0a Makefile.in
--- a/Makefile.in	Tue Dec 14 14:27:30 2021 -0600
+++ b/Makefile.in	Tue Dec 14 15:32:52 2021 -0600
@@ -2436,6 +2436,7 @@
 FT_CFLAGS = @FT_CFLAGS@
 FT_LIBS = @FT_LIBS@
 GMDelegate = @GMDelegate@
+GPG = @GPG@
 GRAPHICSMAGICK_SNAPSHOT_COPY = @GRAPHICSMAGICK_SNAPSHOT_COPY@
 GREP = @GREP@
 GSCMYKDevice = @GSCMYKDevice@
@@ -11312,7 +11313,7 @@
 @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@	$(MAKE) $(DIST_WINDOWS_SRC_7ZIP)
 @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@	for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \
 @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@	  rm -f $${file}.sig ; \
-@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@	  gpg2 --output $${file}.sig --detach-sig $${file} ; \
+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@	  $(GPG) --output $${file}.sig --detach-sig $${file} ; \
 @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@	done
 @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@	$(GRAPHICSMAGICK_SNAPSHOT_COPY) $(SNAPSHOT_DIST_ARCHIVES) \
 @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@	  `for f in $(SNAPSHOT_DIST_ARCHIVES) ; do printf "%s.sig " $$f ; done` \
@@ -11321,7 +11322,7 @@
 @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@	$(MAKE) $(DIST_ARCHIVE_SRPM)
 @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@	$(MAKE) $(DIST_WINDOWS_SRC_7ZIP)
 @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@	for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \
-@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@	  gpg2 --output $${file}.sig --detach-sig $${file} ; \
+@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@	  $(GPG) --output $${file}.sig --detach-sig $${file} ; \
 @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@	done
 @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@	$(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-*.tar.*
 @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@	$(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-*-windows.7z*
@@ -11355,7 +11356,7 @@
 	$(MAKE) $(DIST_WINDOWS_SRC_7ZIP)
 	for file in $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) ; do \
 	  rm -f $${file}.sig ; \
-	  gpg2 --output $${file}.sig --detach-sig $${file} ; \
+	  $(GPG) --output $${file}.sig --detach-sig $${file} ; \
 	done
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -r 1ca97eae5e46 -r 662c664bba0a configure
--- a/configure	Tue Dec 14 14:27:30 2021 -0600
+++ b/configure	Tue Dec 14 15:32:52 2021 -0600
@@ -677,12 +677,15 @@
 type_include_files
 ghostscript_font_dir
 windows_font_dir
+HasGPG_FALSE
+HasGPG_TRUE
 HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE
 HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE
 HasTXT2HTML_FALSE
 HasTXT2HTML_TRUE
 HasRST2HTML_FALSE
 HasRST2HTML_TRUE
+GPG
 GRAPHICSMAGICK_SNAPSHOT_COPY
 TXT2HTML
 RST2HTML
@@ -29198,10 +29201,56 @@
   test -n "$GRAPHICSMAGICK_SNAPSHOT_COPY" && break
 done
 
+
+   # Search for a GnuPG program
+   for ac_prog in gpg gpg2 gpg1
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_GPG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GPG"; then
+  ac_cv_prog_GPG="$GPG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_GPG="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GPG=$ac_cv_prog_GPG
+if test -n "$GPG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPG" >&5
+$as_echo "$GPG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$GPG" && break
+done
+test -n "$GPG" || GPG="false"
+
 else
    RST2HTML=''
    TXT2HTML=''
-   GRAPHICSMAGICK_SNAPSHOT_COPY=''
+   GRAPHICSMAGICK_SNAPSHOT_COPY='false'
+   GPG='false'
 fi
 
 
@@ -29225,7 +29274,7 @@
 
 
 
- if test "x${GRAPHICSMAGICK_SNAPSHOT_COPY}" != 'x'; then
+ if test "x${GRAPHICSMAGICK_SNAPSHOT_COPY}" != 'xfalse'; then
   HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE=
   HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE='#'
 else
@@ -29234,6 +29283,16 @@
 fi
 
 
+
+ if test "x${GPG}" != 'xfalse'; then
+  HasGPG_TRUE=
+  HasGPG_FALSE='#'
+else
+  HasGPG_TRUE='#'
+  HasGPG_FALSE=
+fi
+
+
 #
 # Test for font directories
 #
@@ -30524,6 +30583,10 @@
   as_fn_error $? "conditional \"HasGRAPHICSMAGICK_SNAPSHOT_COPY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HasGPG_TRUE}" && test -z "${HasGPG_FALSE}"; then
+  as_fn_error $? "conditional \"HasGPG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAS_RPM_TRUE}" && test -z "${HAS_RPM_FALSE}"; then
   as_fn_error $? "conditional \"HAS_RPM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff -r 1ca97eae5e46 -r 662c664bba0a configure.ac
--- a/configure.ac	Tue Dec 14 14:27:30 2021 -0600
+++ b/configure.ac	Tue Dec 14 15:32:52 2021 -0600
@@ -3053,10 +3053,14 @@
    # If this script is found, it is used to copy files using the script-provided
    # mechanism due to 'snapshot' target.
    AC_PATH_PROGS([GRAPHICSMAGICK_SNAPSHOT_COPY], [graphicsmagick_snapshot_copy])
+
+   # Search for a GnuPG program
+   AC_CHECK_PROGS([GPG], [gpg gpg2 gpg1], [false])
 else
    RST2HTML=''
    TXT2HTML=''
-   GRAPHICSMAGICK_SNAPSHOT_COPY=''
+   GRAPHICSMAGICK_SNAPSHOT_COPY='false'
+   GPG='false'
 fi
 
 AC_SUBST([RST2HTML])
@@ -3066,7 +3070,10 @@
 AM_CONDITIONAL([HasTXT2HTML],[test "x${TXT2HTML}" != 'x'])
 
 AC_SUBST([GRAPHICSMAGICK_SNAPSHOT_COPY])
-AM_CONDITIONAL([HasGRAPHICSMAGICK_SNAPSHOT_COPY],[test "x${GRAPHICSMAGICK_SNAPSHOT_COPY}" != 'x'])
+AM_CONDITIONAL([HasGRAPHICSMAGICK_SNAPSHOT_COPY],[test "x${GRAPHICSMAGICK_SNAPSHOT_COPY}" != 'xfalse'])
+
+AC_SUBST([GPG])
+AM_CONDITIONAL([HasGPG],[test "x${GPG}" != 'xfalse'])
 
 #
 # Test for font directories
diff -r 1ca97eae5e46 -r 662c664bba0a www/Changelog.html
--- a/www/Changelog.html	Tue Dec 14 14:27:30 2021 -0600
+++ b/www/Changelog.html	Tue Dec 14 15:32:52 2021 -0600
@@ -37,8 +37,11 @@
 
 <p>2021-12-14  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
-* www/download.rst: Add documentation for how to validate
-downloaded files.</blockquote>
+<p>* configure.ac: Search for a GnuPG 'gpg' program.</p>
+<p>* Makefile.am (snapshot): Add support for PGP-signed snapshots.</p>
+<p>* www/download.rst: Add documentation for how to validate
+downloaded files.</p>
+</blockquote>
 <p>2021-12-12  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 <p>* version.sh: Update shared library versioning information for
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.