From c7267ca8c28f4966d8178654e06cf2fd317efd8d Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Tue, 25 Apr 2017 21:40:01 -0700
Subject: [PATCH] dist/make-src-files: Try harder to remove plugins from core
 source.

---
 dist/make-src-files | 11 ++---------
 dist/shared.sh      |  4 +++-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/dist/make-src-files b/dist/make-src-files
index de92b270b..c35c3d707 100755
--- a/dist/make-src-files
+++ b/dist/make-src-files
@@ -57,15 +57,8 @@ notify "Configuring the distribution directory"
 run_command "${SRC_OUT}"-config "${DIST_DIR}"/src ./Setup.sh
 run_command "${DOC_OUT}"-config "${DIST_DIR}"/doc reconf
 
-for plugin in $PLUGINS; do
-    D="${DIST_DIR}"/src/$plugin
-    run_command "${OUTPUT_DIR}"/plugin-$plugin-config \
-		"${DIST_DIR}"/src/$plugin \
-		./autogen.sh
-done
-
-for plugin in glib pango cairo gtk gl planetarium gtk-screen; do
-    my_rm_rf "${DIST_DIR}"/src/$plugin
+for PLUGIN in ${PLUGINS}; do
+    my_rm_rf "${DIST_DIR}"/src/${PLUGIN}
 done
 
 # Clean up after autoconf
diff --git a/dist/shared.sh b/dist/shared.sh
index 733a407b8..90ce192f2 100644
--- a/dist/shared.sh
+++ b/dist/shared.sh
@@ -100,7 +100,9 @@ LIARC_OUT=${OUTPUT_DIR}/liarc
 NATIVE_OUT=${OUTPUT_DIR}/native
 MACOSX_OUT=${OUTPUT_DIR}/macosx
 
-PLUGINS="blowfish gdbm mcrypt md5 mhash x11 edwin x11-screen imail"
+PLUGINS="blowfish edwin gdbm imail mcrypt md5 mhash x11 x11-screen"
+PLUGINS="$PLUGINS berkeley-db pgsql"
+PLUGINS="$PLUGINS cairo gl glib gtk gtk-screen pango planetarium"
 
 notify ()
 {
-- 
2.25.1