diff --git xscreensaver-clean/configure.ac xscreensaver-workdir/configure.ac
index a01792f..a48e1fd 100644
--- xscreensaver-clean/configure.ac
+++ xscreensaver-workdir/configure.ac
@@ -879,7 +879,7 @@ AC_DEFUN([AC_CHECK_XATTR],
 AC_DEFUN([AC_CHECK_X_HEADER], [
   ac_save_CPPFLAGS="$CPPFLAGS"
   if test \! -z "$includedir" ; then 
-    CPPFLAGS="$CPPFLAGS -I$includedir"
+    CPPFLAGS="$CPPFLAGS"
   fi
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
   CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
@@ -891,7 +891,7 @@ AC_DEFUN([AC_CHECK_X_HEADER], [
 AC_DEFUN([AC_EGREP_X_HEADER], [
   ac_save_CPPFLAGS="$CPPFLAGS"
   if test \! -z "$includedir" ; then 
-    CPPFLAGS="$CPPFLAGS -I$includedir"
+    CPPFLAGS="$CPPFLAGS"
   fi
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
   CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
@@ -903,7 +903,7 @@ AC_DEFUN([AC_EGREP_X_HEADER], [
 AC_DEFUN([AC_TRY_X_COMPILE], [
   ac_save_CPPFLAGS="$CPPFLAGS"
   if test \! -z "$includedir" ; then 
-    CPPFLAGS="$CPPFLAGS -I$includedir"
+    CPPFLAGS="$CPPFLAGS"
   fi
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
   CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
@@ -920,13 +920,13 @@ AC_DEFUN([AC_CHECK_X_LIB], [
 #  ac_save_LIBS="$LIBS"
 
   if test \! -z "$includedir" ; then 
-    CPPFLAGS="$CPPFLAGS -I$includedir"
+    CPPFLAGS="$CPPFLAGS"
   fi
   # note: $X_CFLAGS includes $x_includes
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 
   if test \! -z "$libdir" ; then
-    LDFLAGS="$LDFLAGS -L$libdir"
+    LDFLAGS="$LDFLAGS"
   fi
   # note: $X_LIBS includes $x_libraries
   LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS"
@@ -945,7 +945,7 @@ AC_DEFUN([AC_CHECK_X_LIB], [
 AC_DEFUN([AC_TRY_X_RUN], [
   ac_save_CPPFLAGS="$CPPFLAGS"
   if test \! -z "$includedir" ; then 
-    CPPFLAGS="$CPPFLAGS -I$includedir"
+    CPPFLAGS="$CPPFLAGS"
   fi
   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
   CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
@@ -2603,8 +2603,7 @@ if test "$with_gtk" = yes; then
 
   GTK_DATADIR=""
   if test "$have_gtk" = yes; then
-    GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
-    GTK_DATADIR="$GTK_DATADIR/share"
+    GTK_DATADIR="$datadir"
   fi
 
   if test "$have_gtk" = yes; then
@@ -2615,9 +2614,7 @@ if test "$with_gtk" = yes; then
   fi
 
   if test "$have_gtk" = yes; then
-    AC_CACHE_CHECK([for Glib resource compiler], ac_cv_glib_res,
-     [ac_cv_glib_res=`$pkg_config --variable=glib_compile_resources gio-2.0`])
-    GLIB_COMPILE_RESOURCES="$ac_cv_glib_res"
+    AC_PATH_PROG([GLIB_COMPILE_RESOURCES], [glib-compile-resources])
   fi
 
 fi
@@ -4098,11 +4095,11 @@ DEPEND_DEFINES=
 
 
 if test \! -z "$includedir" ; then 
-  INCLUDES="$INCLUDES -I$includedir"
+  INCLUDES="$INCLUDES"
 fi
 
 if test \! -z "$libdir" ; then
-  LDFLAGS="$LDFLAGS -L$libdir"
+  LDFLAGS="$LDFLAGS"
 fi
 
 
@@ -4421,66 +4418,66 @@ if test "$ac_prog_cc_no_pthread" ; then
   warn2 "support POSIX threads."
   echo ""
   warn2 "If you have multiple CPU cores, try CC=$PTHREAD_CC."
-  CONF_STATUS=1
+  CONF_STATUS=0
 elif test "$with_pthread_req" = yes -a "$have_pthread" = no ; then
   warn 'POSIX threads were requested, but were not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$with_sgi_req" = yes -a "$have_sgi" = no ; then
   warn 'The SGI saver extension was requested, but was not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$with_mit_req" = yes -a "$have_mit" = no ; then
   warn 'The MIT-SCREEN-SAVER extension was requested, but was not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$with_xshm_req" = yes -a "$have_xshm" = no ; then
   warn 'The XSHM extension was requested, but was not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$with_xdbe_req" = yes -a "$have_xdbe" = no ; then
   warn 'The DOUBLE-BUFFER extension was requested, but was not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 #if test "$with_xcomposite_req" = yes -a "$have_xcomposite" = no ; then
 #  warn 'The XCOMPOSITE extension was requested, but was not found.'
-#  CONF_STATUS=1
+#  CONF_STATUS=0
 #fi
 
 if test "$with_xkb_req" = yes -a "$have_xkb" = no ; then
   warn 'The X Keyboard extension was requested, but was not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$with_sgivc_req" = yes -a "$have_sgivc" = no ; then
   warn 'The SGI-VIDEO-CONTROL extension was requested, but was not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$with_dpms_req" = yes -a "$have_dpms" = no ; then
   warn 'The DPMS extension was requested, but was not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$with_xinerama_req" = yes -a "$have_xinerama" = no ; then
   warn 'The Xinerama extension was requested, but was not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$with_randr_req" = yes -a "$have_randr" = no ; then
   warn 'The RANDR extension was requested, but was not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$pkg_config" = false ; then
   warnL 'The "pkg-config" program was not found.  Without that,'
   warn2 "detection of the various GTK libraries won't work."
-  CONF_STATUS=1
+  CONF_STATUS=0
 else
   pkgerr=`$pkg_config --list-all 2>&1 >/dev/null`
   if test "x$pkgerr" != "x" ; then
@@ -4489,14 +4486,14 @@ else
     warn2 "The errors are:"
     echo ''
     echo "$pkgerr" | sed 's/^/             > /g'
-    CONF_STATUS=1
+    CONF_STATUS=0
   fi
 fi
 
 if test "$gtk_halfassed" != no ; then
   warnL "GTK was found, but $gtk_halfassed_lib was not, so GTK"
   warn2 "can't be used."
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 motif_warn2() {
@@ -4512,11 +4509,11 @@ if test "$have_motif" = no -a "$have_gtk" = no; then
     warn2 "\`xscreensaver-settings' program requires one of these."
     echo ''
     motif_warn2
-    CONF_STATUS=1
+    CONF_STATUS=0
   else
     warnL "The GTK libraries do not seem to be available; the"
     warn2 "\`xscreensaver-settings' program requires them."
-    CONF_STATUS=1
+    CONF_STATUS=0
 #   echo ''
 #   warn2 'You can use Motif or Lesstif instead of GTK (use the'
 #   warn2 "\`--with-motif' option) but that is NOT recommended."
@@ -4526,24 +4523,24 @@ if test "$have_motif" = no -a "$have_gtk" = no; then
 elif test "$with_motif_req" = yes -a "$have_motif" = no ; then
   warnL "Use of Motif was requested, but it wasn't found;"
   warn2 "Gtk will be used instead."
-  CONF_STATUS=1
+  CONF_STATUS=0
 
 elif test "$with_gtk_req" = yes -a "$have_gtk" = no ; then
   warnL "Use of Gtk was requested, but it wasn't found."
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 
 if test "$ac_cv_libxt" != yes ; then
   warnL 'The Xt library was not found.  It is required.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$have_gtk" = yes -a "$have_gdk_pixbuf" = no ; then
   warn  "GTK is being used, but the GDK-Pixbuf library and/or"
   warn2 "headers were not found.  That can't be good.  Please"
   warn2 "install the GDK-Pixbuf development kit and re-configure."
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$have_motif" = yes -a "$have_lesstif" = yes ; then
@@ -4561,7 +4558,7 @@ if test "$have_motif" = yes -a "$have_lesstif" = yes ; then
     warn2 "use with XScreenSaver; it is strongly recommended"
     warn2 "that you upgrade to at least version $preferred_lesstif!"
     warn2 "See <http://www.lesstif.org/>."
-    CONF_STATUS=1
+    CONF_STATUS=0
   fi
 fi
 
@@ -4580,7 +4577,7 @@ halfassery() {
 
 if test "$with_gdk_pixbuf_req" = yes  -a "$have_gdk_pixbuf" = no; then
   warnL 'Use of GDK-Pixbuf was requested, but it was not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$have_gdk_pixbuf" = no -o "$gdk_pixbuf_halfassed" = yes ; then
@@ -4629,7 +4626,7 @@ fi
 if test "$have_jpeg" = no ; then
   if test "$with_jpeg_req" = yes ; then
     warnL 'Use of libjpeg was requested, but it was not found.'
-    CONF_STATUS=1
+    CONF_STATUS=0
   elif test "$with_jpeg_req" = no ; then
     warnL 'The JPEG library is not being used.'
   else
@@ -4642,7 +4639,7 @@ if test "$have_jpeg" = no ; then
     warn2 "This means that it won't be possible for the image-manipulating"
     warn2 "display modes to load files from disk; and it also means that"
     warn2 "the \`webcollage' program will be much slower."
-    CONF_STATUS=1
+    CONF_STATUS=0
   else
     warn2 "This means the \`webcollage' program will be much slower."
   fi
@@ -4652,7 +4649,7 @@ fi
 if test "$have_png" = no ; then
   if test "$with_png_req" = yes ; then
     warnL 'Use of libpng was requested, but it was not found.'
-    CONF_STATUS=1
+    CONF_STATUS=0
   elif test "$with_png_req" = no ; then
     warnL 'The PNG library is not being used.'
   else
@@ -4661,24 +4658,24 @@ if test "$have_png" = no ; then
 
   if test "$png_halfassed" = yes ; then halfassery ; fi
   warn2 "Many things aren't going to work right."
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 
 if test "$have_xinput" = no ; then
   warnL 'The XInput2 library was not found.  It is required.'
   if test "$xinput_halfassed" = yes ; then halfassery ; else echo '' ; fi
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 
 if test "$have_fontconfig" = no ; then
   warnL 'The fontconfig library was not found.  It is required.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 elif test "$have_xft" = no ; then
   warnL 'The XFreeType library was not found.  It is required.'
   if test "$xft_halfassed" = yes ; then halfassery ; else echo '' ; fi
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 
@@ -4687,11 +4684,11 @@ if test "$have_systemd" = no ; then
   if test "$systemd_too_old" = yes ; then
     warnL "The systemd library is too old."
     systemd_warned=yes
-    CONF_STATUS=1
+    CONF_STATUS=0
   elif test "$with_systemd_req" = yes ; then
     warnL "Use of systemd was requested, but it was not found."
     systemd_warned=yes
-    CONF_STATUS=1
+    CONF_STATUS=0
   elif test "$ac_macosx" = yes; then
     true
   elif test "$with_systemd_req" = no ; then
@@ -4705,7 +4702,7 @@ if test "$have_systemd" = no ; then
   if test "$systemd_halfassed" = yes ; then
     halfassery
     systemd_warned=yes
-    CONF_STATUS=1
+    CONF_STATUS=0
   fi
 
   if test "$systemd_warned" = yes; then
@@ -4721,13 +4718,13 @@ fi
 if test "$have_gl" = no ; then
   if test "$with_gl_req" = yes ; then
     warnL 'The OpenGL 3D library is required, but it was not found.'
-    CONF_STATUS=1
+    CONF_STATUS=0
   elif test "$with_gl_req" = no ; then
     noteL 'The OpenGL 3D library is not being used.'
-    CONF_STATUS=1
+    CONF_STATUS=0
   else
     noteL 'The OpenGL 3D library was not found.'
-    CONF_STATUS=1
+    CONF_STATUS=0
   fi
 
   if test "$gl_halfassed" = yes ; then
@@ -4755,7 +4752,7 @@ if test "$have_gl" = yes -a "$have_gle" = no ; then
     noteL 'Use of the GLE (GL Extrusion) library was requested, but'
     warn2 'it was not found (though the OpenGL library was found, and'
     warn2 'is being used.)'
-    CONF_STATUS=1
+    CONF_STATUS=0
   elif test "$with_gle_req" = no ; then
     noteL 'The OpenGL Library is being used, but the GLE (GL Extrusion)'
     warn2 'library is not.'
@@ -4778,33 +4775,33 @@ fi
 
 if test "$with_readdisplay_req" = yes -a "$have_readdisplay" = no ; then
   warn 'Use of XReadDisplay was requested, but it was not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$with_kerberos_req" = yes -a "$have_kerberos" = no ; then
   warn 'Use of Kerberos was requested, but it was not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$with_pam_req" = yes -a "$have_pam" = no ; then
   warn 'Use of PAM was requested, but it was not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 elif test "$have_pam" = no -a "$enable_locking" = yes ; then
   if test -d /etc/pam.d -o -f /etc/pam.conf ; then
     warn  "Your system seems to have PAM, but PAM is not being used."
     warn2 "That is probably not going to work out well."
-    CONF_STATUS=1
+    CONF_STATUS=0
   fi
 fi
 
 if test "$with_shadow_req" = yes -a "$have_shadow" = no ; then
   warn 'Use of shadow passwords was requested, but they were not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$setcap_hacks_req" = yes -a "$have_libcap" = no ; then
   warn 'Use of libcap was requested, but it was not found.'
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$ac_macosx" = yes -a "$enable_locking" = yes ; then
@@ -4816,7 +4813,7 @@ fi
 if test "$have_jwzgles" = yes ; then
   warn_prefix="$warn_prefix_3"
   warn "The --with-gles option doesn't do what you think. Don't use it."
-  CONF_STATUS=1
+  CONF_STATUS=0
 fi
 
 if test "$setuid_hacks" = no; then
diff --git xscreensaver-clean/driver/Makefile.in xscreensaver-workdir/driver/Makefile.in
index 74b98e6..dfcc7a1 100644
--- xscreensaver-clean/driver/Makefile.in
+++ xscreensaver-workdir/driver/Makefile.in
@@ -280,7 +280,7 @@ TEST_EXES	= test-passwd   test-uid        test-xdpms      test-grab     \
 		  xdpyinfo      test-screens    test-yarandom   test-xinput   \
 	          test-xkb      test-wayland-lock
 
-EXES		= xscreensaver xscreensaver-command xscreensaver-settings
+EXES		= xscreensaver xscreensaver-command
 UTIL_EXES	= xscreensaver-gfx @EXES_SYSTEMD@
 SETUID_EXES	= xscreensaver-auth
 DEMO_EXES	= @ALL_DEMO_PROGRAMS@
@@ -334,7 +334,7 @@ uninstall:: uninstall-pam uninstall-gnome uninstall-systemd
 install-strip:
 	$(MAKE2) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
-install-program:: $(EXES)
+install-program:: $(EXES) xscreensaver-settings
 	@if [ ! -d "$(DESTDIR)$(bindir)" ]; then			      \
 	   echo $(INSTALL_DIRS) "$(DESTDIR)$(bindir)" ;			      \
 	        $(INSTALL_DIRS) "$(DESTDIR)$(bindir)" ;			      \
@@ -344,8 +344,8 @@ install-program:: $(EXES)
 	        $(INSTALL_DIRS) "$(DESTDIR)$(HACKDIR)" ;		      \
 	 fi
 
-install-program:: $(EXES)
-	@for exe in $(EXES); do						      \
+install-program:: $(EXES) xscreensaver-settings
+	@for exe in $(EXES) xscreensaver-settings; do			      \
 	  echo $(INSTALL_PROGRAM) "$$exe" "$(DESTDIR)$(bindir)/$$exe" ;	      \
 	       $(INSTALL_PROGRAM) "$$exe" "$(DESTDIR)$(bindir)/$$exe" ;	      \
 	done
@@ -1402,4 +1402,3 @@ xscreensaver-systemd.o: $(UTILS_SRC)/blurb.h
 xscreensaver-systemd.o: $(UTILS_SRC)/queue.h
 xscreensaver-systemd.o: $(UTILS_SRC)/version.h
 xscreensaver-systemd.o: $(UTILS_SRC)/yarandom.h
-
diff --git xscreensaver-clean/hacks/glx/Makefile.in xscreensaver-workdir/hacks/glx/Makefile.in
index 04402c9..3ef055c 100644
--- xscreensaver-clean/hacks/glx/Makefile.in
+++ xscreensaver-workdir/hacks/glx/Makefile.in
@@ -375,7 +375,7 @@ MAKE2 = $(MAKE)
 MAKE2CC = $(MAKE2) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 default: all
-all: validate_xml $(EXES) $(RETIRED_EXES) $(GLSL_EXES)
+all: $(EXES) $(RETIRED_EXES) $(GLSL_EXES)
 
 install:   install-program    install-scripts install-xml   install-man
 uninstall: uninstall-program  uninstall-xml uninstall-man
@@ -617,7 +617,7 @@ VX = @GL_UTIL_EXES@ @GL_EXES@ @GLE_EXES@ @SUID_EXES@ $(RETIRED_EXES)
 validate_xml:
 	@cd $(HACK_SRC) && $(PERL) check-configs.pl --force $(VX)
 
-distdepend:: check_men validate_xml
+distdepend:: check_men