Issue #138: WSL updates

* Autotools GPG improvements * xdg-configure improvements Signed-off-by: Mike Detwiler <[email protected]>
detwiler · Jul 10, 2024 · 138f137 · 138f137
1 parent a53648a
commit 138f137
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/configure.ac b/configure.ac
@@ -191,6 +191,16 @@ AC_ARG_VAR([CURL], [curl program])
 AC_CHECK_PROGS([CURL], [curl], [no])
 AM_CONDITIONAL([HAVE_CURL], [test "x$CURL" != xno])
 
+## gpg ##
+
+AC_ARG_VAR([GPG], [gpg program])
+AC_CHECK_PROGS([GPG], [gpg2 gpg], [gpg])
+AM_CONDITIONAL([HAVE_GPG], [test "x$GPG" != x])
+
+# gpg2 #
+AM_CONDITIONAL([HAVE_GPG2], [test "x$GPG" = xgpg2])
+AM_COND_IF([HAVE_GPG2], [AC_CONFIG_FILES([data/gnupg/bashrc.d/gpg2.sh])])
+
 ## git ##
 
 AC_ARG_VAR([GIT], [git program])
@@ -263,14 +273,6 @@ QH_VAR_ENSURE([GOMODCACHE],
               [path to Go module cache],
               ["\$(XDG_CACHE_HOME)/go/mod"])
 
-## gpg ##
-
-# gpg2 #
-AC_ARG_VAR([GPG], [gpg program])
-AC_CHECK_PROGS([GPG], [gpg2 gpg], [gpg])
-AM_CONDITIONAL([HAVE_GPG2], [test "x$GPG" = xgpg2])
-AM_COND_IF([HAVE_GPG2], [AC_CONFIG_FILES([data/gnupg/bashrc.d/gpg2.sh])])
-
 ## grep ##
 
 AC_ARG_VAR([EGREP], [path to egrep])

diff --git a/data/Makefile.am b/data/Makefile.am
@@ -35,7 +35,7 @@ if HAVE_GNULIB_REFDIR
 SUBDIRS += gnulib
 endif
 
-if HAVE_GPG2
+if HAVE_GPG
 SUBDIRS += gnupg
 endif
 

diff --git a/xdg-configure b/xdg-configure
@@ -138,8 +138,9 @@ else
 fi
 
 env --ignore-environment \
-    HOME=$HOME \
-    PATH=$PATH \
+    HOME="$HOME" \
+    PATH="$PATH" \
+    TERM="$TERM" \
     ./configure \
     --prefix="$prefix" \
     --sysconfdir="$sysconfdir" \