diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 308 |
1 files changed, 124 insertions, 184 deletions
@@ -631,21 +631,15 @@ OPENSSL_TARGET WSGI_PYTHON_EGG_CACHE_USER WSGI_PYTHON_EGG_CACHE_DIR SETUP_PY_INSTALL_LAYOUT +CFG_INSTALL_TARGETS CA_INSTALL_TARGETS RTR_ORIGIN_INSTALL_TARGETS RCYNIC_INSTALL_TARGETS RCYNIC_HTML_DIR -RCYNIC_STATIC_RSYNC -RCYNIC_GROUP -RCYNIC_USER -RCYNIC_CRON_USER -RCYNIC_CONF_TA_DIR RCYNIC_CONF_DATA -RCYNIC_CONF_RSYNC -RCYNIC_BIN_RCYNIC -RCYNIC_TA_DIR -RCYNIC_CONF_FILE -RCYNIC_JAIL_DIRS +RPKI_GROUP +RPKI_USER +SUDO RSYNC TRANG RRDTOOL @@ -654,7 +648,6 @@ AWK XSLTPROC PYTHON POW_LDFLAGS -LD_STATIC_FLAG EGREP GREP CPP @@ -722,7 +715,6 @@ CA_MAKE_RULES' ac_user_opts=' enable_option_checking with_system_openssl -enable_rcynic_jail enable_openssl_asm enable_ca_tools enable_rp_tools @@ -734,6 +726,7 @@ enable_runtime_dependencies enable_python enable_django enable_rpki_rtr +enable_rcynic_jail ' ac_precious_vars='build_alias host_alias @@ -1359,7 +1352,6 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-rcynic-jail Run rcynic in chroot jail --disable-openssl-asm Don't let OpenSSL build assembler code --disable-ca-tools Don't build any of the CA tools --disable-rp-tools Don't build any of the relying party tools @@ -1376,6 +1368,7 @@ Optional Features: --disable-python (Obsolete, do not use) --disable-django (Obsolete, do not use) --disable-rpki-rtr (Obsolete, do not use) + --enable-rcynic-jail (Obsolete, do not use) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1383,8 +1376,7 @@ Optional Packages: --with-system-openssl Link against system copy of OpenSSL Some influential environment variables: - RCYNIC_DIR Where to put output files from rcynic and rpki-rtr; also - controls jail location for --enable-rcynic-jail + RCYNIC_DIR Where to put output files from rcynic and rpki-rtr APACHE_VERSION Version of Apache httpd, mostly used on FreeBSD where it determines some of the directory names @@ -2425,13 +2417,6 @@ else with_system_openssl=auto fi -# Check whether --enable-rcynic_jail was given. -if test "${enable_rcynic_jail+set}" = set; then : - enableval=$enable_rcynic_jail; -else - enable_rcynic_jail=no -fi - # Check whether --enable-openssl_asm was given. if test "${enable_openssl_asm+set}" = set; then : enableval=$enable_openssl_asm; @@ -2509,6 +2494,11 @@ if test "${enable_rpki_rtr+set}" = set; then : enableval=$enable_rpki_rtr; as_fn_error $? "--disable-rpki-rtr is obsolete. Please see the --disable-rp-tools option" "$LINENO" 5 fi +# Check whether --enable-rcynic_jail was given. +if test "${enable_rcynic_jail+set}" = set; then : + enableval=$enable_rcynic_jail; as_fn_error $? "--enable-rcynic-jail is obsolete." "$LINENO" 5 +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3825,33 +3815,6 @@ _ACEOF -# We'd like to build rcynic as a static binary if we can, because that -# makes it much simpler to run rcynic in a chroot jail, but we don't -# know how to do it on all platforms, so we try the hack we know, and -# if that doesn't work, oh well. -# -# Sadly, it's even worse than this, because there are platforms like -# Fedora where the compiler and linker support -static just fine, but -# the default libraries do not, and if you start down the primrose -# path of installing the necessary libraries, you eventually hit a -# wall where one of the static libraries you downloaded depends on -# something that's not available as a static library, ie, you lose. -# -# So for now I'm just going to make this a FreeBSD-only option. -# Feh. Those of you who choose to use other platforms are welcome to -# fix this and send me the patch, if you care. - - -case $host_os in - freebsd*) - LD_STATIC_FLAG='-static' - ;; - *) - LD_STATIC_FLAG='' - ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler and linker support -Wl,-Bsymbolic" >&5 $as_echo_n "checking whether compiler and linker support -Wl,-Bsymbolic... " >&6; } old_LDFLAGS="$LDFLAGS" @@ -4246,6 +4209,46 @@ $as_echo "no" >&6; } fi +# Extract the first word of "sudo", so it can be a program name with args. +set dummy sudo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_SUDO+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $SUDO in + [\\/]* | ?:[\\/]*) + ac_cv_path_SUDO="$SUDO" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SUDO="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +SUDO=$ac_cv_path_SUDO +if test -n "$SUDO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUDO" >&5 +$as_echo "$SUDO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + # See whether we need to check for dependencies that we only need at # runtime. We do this by default when compiling from source to avoid @@ -4509,18 +4512,14 @@ fi if test "X$RCYNIC_DIR" = "X" then - rcynic_base_dir='/var/rcynic' -else - rcynic_base_dir="${RCYNIC_DIR}" + RCYNIC_DIR='/var/rcynic' fi -RCYNIC_DIR='${DESTDIR}'"${rcynic_base_dir}" - # APACHE_VERSION is another "precious" argument to this script. It # mostly matters on FreeBSD, where most things involving Apache encode # the Apache version number into their filenames. # -# If we can't figure out the version number, we assume 2.2 and hope +# If we can't figure out the version number, we assume 2.4 and hope # for the best; at some point we may need to do better than this. # # apachectl sometimes whines about ulimits, so we discard its stderr. @@ -4544,8 +4543,8 @@ fi if test "X$APACHE_VERSION" = "X" then - APACHE_VERSION="22" - msg='not found, defaulting to 2.2' + APACHE_VERSION="24" + msg='not found, defaulting to 2.4' else msg=`echo $APACHE_VERSION | sed 's=.=&.='` fi @@ -4553,70 +4552,15 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5 $as_echo "$msg" >&6; } -# Figure out whether to run rcynic in a chroot jail, which determines -# a bunch of other settings. - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build chroot jail for rcynic" >&5 -$as_echo_n "checking whether to build chroot jail for rcynic... " >&6; } - -case $enable_rcynic_jail in - yes) - use_rcynic_jail=yes - RCYNIC_CONF_FILE='${RCYNIC_DIR}/etc/rcynic.conf' - RCYNIC_TA_DIR='${RCYNIC_DIR}/etc/trust-anchors' - RCYNIC_BIN_RCYNIC='${RCYNIC_DIR}/bin/rcynic' - RCYNIC_CONF_RSYNC='/bin/rsync' - RCYNIC_CONF_DATA='/data' - RCYNIC_CONF_TA_DIR='/etc/trust-anchors' - RCYNIC_CRON_USER='root' - RCYNIC_JAIL_DIRS='${RCYNIC_DIR}/bin ${RCYNIC_DIR}/dev ${RCYNIC_DIR}/etc' - if test "X$host_os" = "Xlinux" - then - RCYNIC_JAIL_DIRS="$RCYNIC_JAIL_DIRS "'${RCYNIC_DIR}/lib ${RCYNIC_DIR}/lib64 ${RCYNIC_DIR}/usr/lib' - fi - ;; - no) - use_rcynic_jail=no - RCYNIC_CONF_FILE='${DESTDIR}${sysconfdir}/rcynic.conf' - RCYNIC_TA_DIR='${DESTDIR}${sysconfdir}/rpki/trust-anchors' - RCYNIC_BIN_RCYNIC='${DESTDIR}${bindir}/rcynic' - RCYNIC_CONF_RSYNC="${RSYNC}" - RCYNIC_CONF_DATA="${rcynic_base_dir}/data" - RCYNIC_CONF_TA_DIR='${sysconfdir}/rpki/trust-anchors' - RCYNIC_CRON_USER='${RCYNIC_USER}' - RCYNIC_JAIL_DIRS='' - ;; - *) - as_fn_error $? "Unrecognized value for --enable-rcynic-jail: $enable_rcynic_jail" "$LINENO" 5 - ;; -esac - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_rcynic_jail" >&5 -$as_echo "$use_rcynic_jail" >&6; } - # Perhaps there should be a way to set these, but for now just # wire them in here so at least they're consistent in all Makefiles. -RCYNIC_USER=rcynic +RPKI_USER=rpki -RCYNIC_GROUP=rcynic +RPKI_GROUP=rpki -if test $use_rcynic_jail = yes && test "X$LD_STATIC_FLAG" != "X" -then - RCYNIC_STATIC_RSYNC='static-rsync/rsync' -else - RCYNIC_STATIC_RSYNC='' -fi +RCYNIC_CONF_DATA="${RCYNIC_DIR}/data" @@ -4638,10 +4582,8 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_target_installation" >&5 $as_echo "$enable_target_installation" >&6; } -# rcynic jail setup is complicated enough that it's simplest to have -# different rule sets for different platforms. Icky, but.... -# rpki-rtr isn't as complicated, but has similar issues, same hack. -# ca isn't as complicated either, but same hack. +# Some bits of post-installation setup are complicated enough that +# it's simplest to have different rule sets for different platforms. case $host_os in darwin*) @@ -4691,29 +4633,29 @@ $as_echo "$RCYNIC_HTML_DIR" >&6; } -# Sort out which things to install, depending on rcynic jail status and whether +# Sort out which things to install, depending on whether # we're doing final target installation. +# +# As things have evolved, this a bit repetitive. Simplify someday, maybe. RCYNIC_INSTALL_TARGETS='install-always' RTR_ORIGIN_INSTALL_TARGETS='install-always' CA_INSTALL_TARGETS='install-always' - -if test $use_rcynic_jail = yes -then - RCYNIC_INSTALL_TARGETS="$RCYNIC_INSTALL_TARGETS install-jailed" -fi +CFG_INSTALL_TARGETS='install-always' if test $enable_target_installation = yes then RCYNIC_INSTALL_TARGETS="$RCYNIC_INSTALL_TARGETS install-postconf" RTR_ORIGIN_INSTALL_TARGETS="$RTR_ORIGIN_INSTALL_TARGETS install-postconf" CA_INSTALL_TARGETS="$CA_INSTALL_TARGETS install-postconf" + CFG_INSTALL_TARGETS="$CFG_INSTALL_TARGETS install-postconf" fi + # Now a bunch of checks to figure out what we can do with Python. If # we don't have Python at all, none of the rest of this matters. If # we do have Python, we need to check for required packages and @@ -4724,9 +4666,9 @@ then as_fn_error $? "I can't find a Python binary at all, this isn't going to work. Perhaps you need to set PATH?" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python version 2.6 or higher" >&5 -$as_echo_n "checking for Python version 2.6 or higher... " >&6; } -have_acceptable_python=`$PYTHON -c 'import sys; print "yes" if sys.version_info[0] == 2 and sys.version_info[1] >= 6 else "no"'` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python version 2.7 or higher" >&5 +$as_echo_n "checking for Python version 2.7 or higher... " >&6; } +have_acceptable_python=`$PYTHON -c 'import sys; print "yes" if sys.version_info[0] == 2 and sys.version_info[1] >= 7 else "no"'` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_acceptable_python" >&5 $as_echo "$have_acceptable_python" >&6; } @@ -4752,11 +4694,22 @@ if $PYTHON -c 'import lxml.etree' 2>/dev/null; then have_lxml=yes; else have_lxm { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_lxml" >&5 $as_echo "$have_lxml" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQLdb" >&5 -$as_echo_n "checking for MySQLdb... " >&6; } -if $PYTHON -c 'import MySQLdb' 2>/dev/null; then have_mysqldb=yes; else have_mysqldb=no; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_mysqldb" >&5 -$as_echo "$have_mysqldb" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tornado" >&5 +$as_echo_n "checking for Tornado... " >&6; } +if $PYTHON -c 'import tornado' 2>/dev/null; then have_tornado=yes; else have_tornado=no; fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_tornado" >&5 +$as_echo "$have_tornado" >&6; } + +if test $have_tornado = yes +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tornado 4.2 or higher" >&5 +$as_echo_n "checking for Tornado 4.2 or higher... " >&6; } + have_acceptable_tornado=`$PYTHON -c "import tornado; print 'no' if tornado.version_info < (4, 2) else 'yes'"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_acceptable_tornado" >&5 +$as_echo "$have_acceptable_tornado" >&6; } +else + have_acceptable_tornado=no +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Django" >&5 $as_echo_n "checking for Django... " >&6; } @@ -4766,9 +4719,9 @@ $as_echo "$have_django" >&6; } if test $have_django = yes then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Django 1.3.7 or higher" >&5 -$as_echo_n "checking for Django 1.3.7 or higher... " >&6; } - have_acceptable_django=`$PYTHON -c "import django; print 'no' if django.VERSION < (1, 3, 7) else 'yes'"` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Django 1.8 or higher" >&5 +$as_echo_n "checking for Django 1.8 or higher... " >&6; } + have_acceptable_django=`$PYTHON -c "import django; print 'no' if django.VERSION < (1, 8) else 'yes'"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_acceptable_django" >&5 $as_echo "$have_acceptable_django" >&6; } else @@ -4787,23 +4740,6 @@ if $PYTHON -c 'import vobject' 2>/dev/null; then have_vobject=yes; else have_vob { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_vobject" >&5 $as_echo "$have_vobject" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Django South" >&5 -$as_echo_n "checking for Django South... " >&6; } -if $PYTHON -c 'import south' 2>/dev/null; then have_django_south=yes; else have_django_south=no; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_django_south" >&5 -$as_echo "$have_django_south" >&6; } - -if test $have_django_south = yes -then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Django South 0.7.5 or later" >&5 -$as_echo_n "checking for Django South 0.7.5 or later... " >&6; } - have_acceptable_django_south=`$PYTHON -c "import south; print 'no' if map(int,south.__version__.split('.')) < [0, 7, 5] else 'yes'"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_acceptable_django_south" >&5 -$as_echo "$have_acceptable_django_south" >&6; } -else - have_acceptable_django_south=no -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for argparse" >&5 $as_echo_n "checking for argparse... " >&6; } if $PYTHON -c 'import argparse' 2>/dev/null; then have_argparse=yes; else have_argparse=no; fi @@ -4823,8 +4759,8 @@ runtime_ok=yes if test $have_acceptable_python = no then runtime_ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI code requires Python version 2.x, for x = 6 or higher." >&5 -$as_echo "$as_me: WARNING: The RPKI code requires Python version 2.x, for x = 6 or higher." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI code requires Python version 2.x, for x = 7 or higher." >&5 +$as_echo "$as_me: WARNING: The RPKI code requires Python version 2.x, for x = 7 or higher." >&2;} fi if test $build_rp_tools = yes @@ -4832,8 +4768,8 @@ then if test $have_python_h = no then build_ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I can't find Python.h. Python sources are required to build the RP tools." >&5 -$as_echo "$as_me: WARNING: I can't find Python.h. Python sources are required to build the RP tools." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I can't find Python.h. Python sources are required to build the rpki.POW module." >&5 +$as_echo "$as_me: WARNING: I can't find Python.h. Python sources are required to build the rpki.POW module." >&2;} fi if test "x$RRDTOOL" = "x" then @@ -4841,7 +4777,7 @@ $as_echo "$as_me: WARNING: I can't find Python.h. Python sources are required t { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: rcynic-html requires rrdtool." >&5 $as_echo "$as_me: WARNING: rcynic-html requires rrdtool." >&2;} fi - if test $use_rcynic_jail = no && test "X$RSYNC" = "X" + if test "X$RSYNC" = "X" then runtime_ok=no { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI relying party tools require rsync." >&5 @@ -4849,38 +4785,42 @@ $as_echo "$as_me: WARNING: The RPKI relying party tools require rsync." >&2;} fi fi +if test $have_lxml = no +then + runtime_ok=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI tools require the Python LXML package." >&5 +$as_echo "$as_me: WARNING: The RPKI tools require the Python LXML package." >&2;} +fi + +if test $have_acceptable_django = no +then + runtime_ok=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI tools require Django 1.8 or higher." >&5 +$as_echo "$as_me: WARNING: The RPKI tools require Django 1.8 or higher." >&2;} +fi + +if test $have_argparse = no +then + runtime_ok=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI tools require the Python argparse module." >&5 +$as_echo "$as_me: WARNING: The RPKI tools require the Python argparse module." >&2;} +fi + +if test $have_acceptable_tornado = no +then + runtime_ok=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI tools require Tornado 4.2 or higher." >&5 +$as_echo "$as_me: WARNING: The RPKI tools require Tornado 4.2 or higher." >&2;} +fi + if test $build_ca_tools = yes then - if test $have_lxml = no - then - runtime_ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI tools require the Python LXML module." >&5 -$as_echo "$as_me: WARNING: The RPKI tools require the Python LXML module." >&2;} - fi - if test $have_acceptable_django = no - then - runtime_ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI CA tools require Django 1.3.7 or higher." >&5 -$as_echo "$as_me: WARNING: The RPKI CA tools require Django 1.3.7 or higher." >&2;} - fi if test $have_vobject = no then runtime_ok=no { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI CA GUI requires the Python vobject module." >&5 $as_echo "$as_me: WARNING: The RPKI CA GUI requires the Python vobject module." >&2;} fi - if test $have_acceptable_django_south = no - then - runtime_ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI CA tools require Django South 0.7.5 or higher." >&5 -$as_echo "$as_me: WARNING: The RPKI CA tools require Django South 0.7.5 or higher." >&2;} - fi - if test $have_argparse = no - then - runtime_ok=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The RPKI CA tools require the Python argparse module." >&5 -$as_echo "$as_me: WARNING: The RPKI CA tools require the Python argparse module." >&2;} - fi if test $have_pyyaml = no then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: PyYAML missing, so \"make test\" will not work properly." >&5 @@ -5084,7 +5024,7 @@ fi if test $build_rp_tools = yes then - ac_config_files="$ac_config_files rp/Makefile rp/rcynic/Makefile rp/rcynic/static-rsync/Makefile rp/utils/Makefile rp/rpki-rtr/Makefile" + ac_config_files="$ac_config_files rp/Makefile rp/config/Makefile rp/rcynic/Makefile rp/utils/Makefile rp/rpki-rtr/Makefile" fi @@ -5838,8 +5778,8 @@ do "openssl/Makefile") CONFIG_FILES="$CONFIG_FILES openssl/Makefile" ;; "openssl/tests/Makefile") CONFIG_FILES="$CONFIG_FILES openssl/tests/Makefile" ;; "rp/Makefile") CONFIG_FILES="$CONFIG_FILES rp/Makefile" ;; + "rp/config/Makefile") CONFIG_FILES="$CONFIG_FILES rp/config/Makefile" ;; "rp/rcynic/Makefile") CONFIG_FILES="$CONFIG_FILES rp/rcynic/Makefile" ;; - "rp/rcynic/static-rsync/Makefile") CONFIG_FILES="$CONFIG_FILES rp/rcynic/static-rsync/Makefile" ;; "rp/utils/Makefile") CONFIG_FILES="$CONFIG_FILES rp/utils/Makefile" ;; "rp/rpki-rtr/Makefile") CONFIG_FILES="$CONFIG_FILES rp/rpki-rtr/Makefile" ;; "ca/Makefile") CONFIG_FILES="$CONFIG_FILES ca/Makefile" ;; |