More autoconf

svn path=/buildtools/python-header; revision=3574

1 files changed, 36 insertions, 20 deletions

diff --git a/configure b/configure
index 90877dda..19d7af2c 100755
--- a/configure
+++ b/configure
@@ -700,6 +700,7 @@ OPENSSL_CONFIG_COMMAND
 XSLTPROC
 AWK
 PYTHON
+PYWRAP
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -4531,25 +4532,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).
 
+if test $build_pywrap = yes
+then
+	# Eventually this should be the installation directory, but
+	# we're not there yet.
+
+	PYWRAP=`pwd`/pow/pywrap/pywrap
+else
+	PYWRAP=$PYTHON
+fi
+
+
 if test $build_python = yes
 then
-	ac_config_files="$ac_config_files rpkid/backup-sql"
 
-	ac_config_files="$ac_config_files rpkid/irbe_cli"
+	# 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"
 
-	ac_config_files="$ac_config_files rpkid/irdbd"
+	ac_config_files="$ac_config_files rpkid/sql-setup:buildtools/python-header:rpkid/sql-setup.py"
 
-	ac_config_files="$ac_config_files rpkid/myrpki"
+	ac_config_files="$ac_config_files rpkid/start-servers:buildtools/python-header:rpkid/start-servers.py"
 
-	ac_config_files="$ac_config_files rpkid/pubd"
 
-	ac_config_files="$ac_config_files rpkid/rootd"
+	# These use POW, so may require pywrap
+	ac_config_files="$ac_config_files rpkid/irbe_cli:buildtools/pywrap-header:rpkid/irbe_cli.py"
 
-	ac_config_files="$ac_config_files rpkid/rpkid"
+	ac_config_files="$ac_config_files rpkid/irdbd:buildtools/pywrap-header:rpkid/irdbd.py"
 
-	ac_config_files="$ac_config_files rpkid/sql-setup"
+	ac_config_files="$ac_config_files rpkid/myrpki:buildtools/pywrap-header:rpkid/myrpki.py"
 
-	ac_config_files="$ac_config_files rpkid/start-servers"
+	ac_config_files="$ac_config_files rpkid/pubd:buildtools/pywrap-header:rpkid/pubd.py"
+
+	ac_config_files="$ac_config_files rpkid/rootd:buildtools/pywrap-header:rpkid/rootd.py"
+
+	ac_config_files="$ac_config_files rpkid/rpkid:buildtools/pywrap-header:rpkid/rpkid.py"
 
 fi
 
@@ -5163,15 +5179,15 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "rcynic/show.sh") CONFIG_FILES="$CONFIG_FILES rcynic/show.sh" ;;
-    "rpkid/backup-sql") CONFIG_FILES="$CONFIG_FILES rpkid/backup-sql" ;;
-    "rpkid/irbe_cli") CONFIG_FILES="$CONFIG_FILES rpkid/irbe_cli" ;;
-    "rpkid/irdbd") CONFIG_FILES="$CONFIG_FILES rpkid/irdbd" ;;
-    "rpkid/myrpki") CONFIG_FILES="$CONFIG_FILES rpkid/myrpki" ;;
-    "rpkid/pubd") CONFIG_FILES="$CONFIG_FILES rpkid/pubd" ;;
-    "rpkid/rootd") CONFIG_FILES="$CONFIG_FILES rpkid/rootd" ;;
-    "rpkid/rpkid") CONFIG_FILES="$CONFIG_FILES rpkid/rpkid" ;;
-    "rpkid/sql-setup") CONFIG_FILES="$CONFIG_FILES rpkid/sql-setup" ;;
-    "rpkid/start-servers") CONFIG_FILES="$CONFIG_FILES rpkid/start-servers" ;;
+    "rpkid/backup-sql") CONFIG_FILES="$CONFIG_FILES rpkid/backup-sql:buildtools/python-header:rpkid/backup-sql.py" ;;
+    "rpkid/sql-setup") CONFIG_FILES="$CONFIG_FILES rpkid/sql-setup:buildtools/python-header:rpkid/sql-setup.py" ;;
+    "rpkid/start-servers") CONFIG_FILES="$CONFIG_FILES rpkid/start-servers:buildtools/python-header:rpkid/start-servers.py" ;;
+    "rpkid/irbe_cli") CONFIG_FILES="$CONFIG_FILES rpkid/irbe_cli:buildtools/pywrap-header:rpkid/irbe_cli.py" ;;
+    "rpkid/irdbd") CONFIG_FILES="$CONFIG_FILES rpkid/irdbd:buildtools/pywrap-header:rpkid/irdbd.py" ;;
+    "rpkid/myrpki") CONFIG_FILES="$CONFIG_FILES rpkid/myrpki:buildtools/pywrap-header:rpkid/myrpki.py" ;;
+    "rpkid/pubd") CONFIG_FILES="$CONFIG_FILES rpkid/pubd:buildtools/pywrap-header:rpkid/pubd.py" ;;
+    "rpkid/rootd") CONFIG_FILES="$CONFIG_FILES rpkid/rootd:buildtools/pywrap-header:rpkid/rootd.py" ;;
+    "rpkid/rpkid") CONFIG_FILES="$CONFIG_FILES rpkid/rpkid:buildtools/pywrap-header:rpkid/rpkid.py" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "openssl/Makefile") CONFIG_FILES="$CONFIG_FILES openssl/Makefile" ;;
     "rcynic/Makefile") CONFIG_FILES="$CONFIG_FILES rcynic/Makefile" ;;
@@ -5641,14 +5657,14 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;}
   case $ac_file$ac_mode in
     "rcynic/show.sh":F) chmod +x rcynic/show.sh ;;
     "rpkid/backup-sql":F) chmod +x rpkid/backup-sql ;;
+    "rpkid/sql-setup":F) chmod +x rpkid/sql-setup ;;
+    "rpkid/start-servers":F) chmod +x rpkid/start-servers ;;
     "rpkid/irbe_cli":F) chmod +x rpkid/irbe_cli ;;
     "rpkid/irdbd":F) chmod +x rpkid/irdbd ;;
     "rpkid/myrpki":F) chmod +x rpkid/myrpki ;;
     "rpkid/pubd":F) chmod +x rpkid/pubd ;;
     "rpkid/rootd":F) chmod +x rpkid/rootd ;;
     "rpkid/rpkid":F) chmod +x rpkid/rpkid ;;
-    "rpkid/sql-setup":F) chmod +x rpkid/sql-setup ;;
-    "rpkid/start-servers":F) chmod +x rpkid/start-servers ;;
 
   esac
 done # for ac_tag