aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2014-04-08 23:14:52 +0000
committerRob Austein <sra@hactrn.net>2014-04-08 23:14:52 +0000
commit1786df7be1be1a8c7af23d0701cafcb9d8fb6d48 (patch)
tree5c5e7e4396558eda91117f791f0e25d46b983dc8 /configure
parent4b18b371047d97257a908803e0c60bf1f3619222 (diff)
First cut at revised top-level rules and macros. Tediously verbose at
the moment, clean that up later, but seems to work as intended. svn path=/branches/tk685/; revision=5769
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure13
1 files changed, 8 insertions, 5 deletions
diff --git a/configure b/configure
index f701ab4c..92896c7e 100755
--- a/configure
+++ b/configure
@@ -625,7 +625,9 @@ WSGI_PROCESS_GROUP
WSGI_DAEMON_PROCESS
OPENSSL_SO_GLOB
OPENSSL_CONFIG_COMMAND
-TOP_LEVEL_SUBDIRS
+CA_TARGET
+RP_TARGET
+OPENSSL_TARGET
WSGI_PYTHON_EGG_CACHE_USER
WSGI_PYTHON_EGG_CACHE_DIR
SETUP_PY_INSTALL_LAYOUT
@@ -4990,10 +4992,11 @@ fi
# Figure out which parts of this package we have to build.
- TOP_LEVEL_SUBDIRS="h schemas"
-test $build_openssl = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS openssl"
-test $build_rp_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rp"
-test $build_ca_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS ca"
+if test $build_openssl = yes; then OPENSSL_TARGET=openssl; else OPENSSL_TARGET=noop; fi
+if test $build_rp_tools = yes; then RP_TARGET=rp; else RP_TARGET=noop; fi
+if test $build_ca_tools = yes; then CA_TARGET=ca; else CA_TARGET=noop; fi
+
+