1 files changed, 24 insertions, 5 deletions

diff --git a/configure b/configure
index 1238109a..a28610fa 100755
--- a/configure
+++ b/configure
@@ -700,6 +700,7 @@ OPENSSL_CONFIG_COMMAND
 XSLTPROC
 AWK
 PYTHON
+TOP_LEVEL_SUBDIRS
 PYWRAP
 LIBOBJS
 LTLIBOBJS'
@@ -4532,20 +4533,40 @@ fi
 # If any of this fails, we need to tell the user and give useful hint
 # on what to do next (doc reference, whatever).
 
+TOP_LEVEL_SUBDIRS=""
+
+if test $build_openssl = yes
+then
+	TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS openssl"
+fi
+
+TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rcynic utils"
+
 if test $build_pywrap = yes
 then
-	# Eventually this should be the installation directory, but
-	# we're not there yet.
+	TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS pywrap"
+fi
 
+if test $build_python = yes
+then
+	TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS pow rpkid"
+fi
+
+
+
+if test $build_pywrap = yes
+then
+	# Eventually this should be the installation directory, but
+	# for now we're still running out of the build tree.
 	PYWRAP=`pwd`/pow/pywrap/pywrap
 else
+	# If we don't need pywrap, just make it expand to python
 	PYWRAP=$PYTHON
 fi
 
 
 if test $build_python = yes
 then
-
 	# These are plain Python scripts, do not require pywrap
 	ac_config_files="$ac_config_files rpkid/backup-sql:buildtools/python-header:rpkid/backup-sql.py"
 
@@ -4577,8 +4598,6 @@ then
 
 	ac_config_files="$ac_config_files rpkid/tests/testpoke:buildtools/pywrap-header:rpkid/tests/testpoke.py"
 
-
-
 fi
 
 # This isn't the complete list of Makefiles (let alone setup.py, etc