|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 46/46] rerun autogen.sh
Signed-off-by: Olaf Hering <olaf@xxxxxxxxx> --- configure | 125 ++++++++++++++++++++++++++----- tools/configure | 222 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 298 insertions(+), 49 deletions(-) diff --git a/configure b/configure index 5090baf..19da80f 100755 --- a/configure +++ b/configure @@ -598,19 +598,24 @@ XEN_PAGING_DIR XEN_LOCK_DIR XEN_SCRIPT_DIR XEN_CONFIG_DIR +INITD_DIR CONFIG_DIR -XENFIRMWAREDIR -PRIVATE_BINDIR -PKG_XEN_PREFIX -PRIVATE_PREFIX +DOCDIR +MANDIR SHAREDIR XEN_LIB_STORED XEN_LOG_DIR XEN_RUN_DIR LIBDIR +LIBEXEC_BOOT +LIBEXEC_INC +LIBEXEC_LIB +LIBEXEC_BIN LIBEXEC +INCLUDEDIR SBINDIR BINDIR +BASH_COMPLETION_DIR host_os host_vendor host_cpu @@ -660,6 +665,8 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +with_initd_dir +with_bash_completion_dir enable_xen enable_tools enable_stubdom @@ -1289,6 +1296,15 @@ Optional Features: --enable-stubdom Enable build and install of stubdom --disable-docs Disable build and install of docs +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-initd-dir=DIR Path to directory with sysv runlevel scripts. + [PREFIX/etc/init.d] + --with-bash_completion-dir=DIR + Path to directory with sysv runlevel scripts. + [SYSCONFDIR/bash_completion.d] + Report bugs to <xen-devel@xxxxxxxxxxxxx>. Xen Hypervisor home page: <http://www.xen.org/>. _ACEOF @@ -1851,6 +1867,57 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac test "x$prefix" = "xNONE" && prefix=$ac_default_prefix test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} +if test "x$localstatedir" = 'x${prefix}/var' ; then + localstatedir=/var +fi + +if test "x$sysconfdir" = 'x${prefix}/etc' ; then + case "$host_os" in + *freebsd*) + sysconfdir=$prefix/etc + ;; + *solaris*) + if test "$prefix" = "/usr" ; then + sysconfdir=/etc + else + sysconfdir=$prefix/etc + fi + ;; + *) + sysconfdir=/etc + ;; + esac +fi + + +# Check whether --with-initd-dir was given. +if test "${with_initd_dir+set}" = set; then : + withval=$with_initd_dir; initd_dir_path=$withval +else + case "$host_os" in + *linux*) + if test -d $sysconfdir/rc.d/init.d ; then + initd_dir_path=$sysconfdir/rc.d/init.d + else + initd_dir_path=$sysconfdir/init.d + fi + ;; + *) + initd_dir_path=$sysconfdir/rc.d + ;; + esac +fi + + + +# Check whether --with-bash_completion-dir was given. +if test "${with_bash_completion_dir+set}" = set; then : + withval=$with_bash_completion_dir; BASH_COMPLETION_DIR=$withval +else + BASH_COMPLETION_DIR=$sysconfdir/bash_completion.d +fi + + BINDIR=$prefix/bin @@ -1858,37 +1925,55 @@ BINDIR=$prefix/bin SBINDIR=$prefix/sbin -LIBEXEC=$prefix/lib/xen/bin +INCLUDEDIR=`eval echo $includedir` -LIBDIR=`eval echo $libdir` +if test "x$libexecdir" = 'x${exec_prefix}/libexec' ; then + case "$host_os" in + *netbsd*) + libexecdir=$prefix/libexec + ;; + *) + libexecdir=$prefix/lib + ;; + esac +fi +LIBEXEC=`eval echo $libexecdir/xen` +LIBEXEC_BIN=$LIBEXEC/bin +LIBEXEC_LIB=$LIBEXEC/lib +LIBEXEC_INC=$LIBEXEC/include +LIBEXEC_BOOT=$LIBEXEC/boot -XEN_RUN_DIR=/var/run/xen -XEN_LOG_DIR=/var/log/xen -XEN_LIB_STORED=/var/lib/xenstored +LIBDIR=`eval echo $libdir` -SHAREDIR=$prefix/share +XEN_RUN_DIR=$localstatedir/run/xen -PRIVATE_PREFIX=$LIBDIR/xen +XEN_LOG_DIR=$localstatedir/log/xen -PKG_XEN_PREFIX=$LIBDIR/xen +XEN_LIB_STORED=$localstatedir/lib/xenstored -PRIVATE_BINDIR=$PRIVATE_PREFIX/bin +SHAREDIR=$prefix/share -XENFIRMWAREDIR=$prefix/lib/xen/boot +MANDIR=`eval eval echo $mandir` -CONFIG_DIR=/etc +DOCDIR=`eval eval echo $docdir` + + +CONFIG_DIR=$sysconfdir + + +INITD_DIR=$initd_dir_path XEN_CONFIG_DIR=$CONFIG_DIR/xen @@ -1897,13 +1982,17 @@ XEN_CONFIG_DIR=$CONFIG_DIR/xen XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts -XEN_LOCK_DIR=/var/lock +case "$host_os" in +*freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;; +*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;; +*) XEN_LOCK_DIR=$localstatedir/lock ;; +esac -XEN_RUN_DIR=/var/run/xen +XEN_RUN_DIR=$localstatedir/run/xen -XEN_PAGING_DIR=/var/lib/xen/xenpaging +XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging diff --git a/tools/configure b/tools/configure index 3830da4..dbecb4a 100755 --- a/tools/configure +++ b/tools/configure @@ -696,6 +696,7 @@ qemu_xen rombios qemu_traditional blktap2 +LINUX_BACKEND_MODULES blktap1 debug seabios @@ -704,23 +705,29 @@ xsmpolicy ocamltools monitors githttp +rpath XEN_PAGING_DIR XEN_LOCK_DIR XEN_SCRIPT_DIR XEN_CONFIG_DIR +INITD_DIR CONFIG_DIR -XENFIRMWAREDIR -PRIVATE_BINDIR -PKG_XEN_PREFIX -PRIVATE_PREFIX +DOCDIR +MANDIR SHAREDIR XEN_LIB_STORED XEN_LOG_DIR XEN_RUN_DIR LIBDIR +LIBEXEC_BOOT +LIBEXEC_INC +LIBEXEC_LIB +LIBEXEC_BIN LIBEXEC +INCLUDEDIR SBINDIR BINDIR +BASH_COMPLETION_DIR FILE_OFFSET_BITS OBJEXT EXEEXT @@ -780,6 +787,9 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_largefile +with_initd_dir +with_bash_completion_dir +enable_rpath enable_githttp enable_monitors enable_ocamltools @@ -788,6 +798,7 @@ enable_ovmf enable_seabios enable_debug enable_blktap1 +with_linux_backend_modules enable_blktap2 enable_qemu_traditional enable_rombios @@ -1445,6 +1456,8 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-largefile omit support for large files + --enable-rpath Build tools with -Wl,-rpath,LIBDIR (default is + DISABLED) --enable-githttp Download GIT repositories via HTTP (default is DISABLED) --disable-monitors Disable xenstat and xentop monitoring tools (default @@ -1467,6 +1480,14 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-initd-dir=DIR Path to directory with sysv runlevel scripts. + [PREFIX/etc/init.d] + --with-bash_completion-dir=DIR + Path to directory with sysv runlevel scripts. + [SYSCONFDIR/bash_completion.d] + --with-linux-backend-modules="mod1 mod2" + List of Linux backend module or modalias names to be + autoloaded on startup. --with-system-qemu[=PATH] Use system supplied qemu PATH or qemu (taken from $PATH) as qemu-xen device model instead of building @@ -2251,7 +2272,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_files="$ac_config_files ../config/Tools.mk hotplug/Linux/init.d/xencommons.in hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/systemd/proc-xen.mount hotplug/Linux/systemd/var-lib-xenstored.mount hotplug/Linux/systemd/xenstored.socket hotplug/Linux/systemd/xenstored_ro.socket hotplug/Linux/systemd/xenstored.service hotplug/Linux/systemd/xenconsoled.service hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service hotplug/Linux/systemd/xendomains.service hotplug/Linux/systemd/xen-watchdog.service" +ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/systemd/proc-xen.mount hotplug/Linux/systemd/var-lib-xenstored.mount hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service hotplug/Linux/systemd/xen-watchdog.service hotplug/Linux/systemd/xenconsoled.service hotplug/Linux/systemd/xendomains.service hotplug/Linux/systemd/xenstored.service hotplug/Linux/systemd/xenstored.socket hotplug/Linux/systemd/xenstored_ro.socket hotplug/Linux/vif-setup hotplug/Linux/xen-backend.rules hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons" ac_config_headers="$ac_config_headers config.h" @@ -3682,6 +3703,57 @@ esac test "x$prefix" = "xNONE" && prefix=$ac_default_prefix test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} +if test "x$localstatedir" = 'x${prefix}/var' ; then + localstatedir=/var +fi + +if test "x$sysconfdir" = 'x${prefix}/etc' ; then + case "$host_os" in + *freebsd*) + sysconfdir=$prefix/etc + ;; + *solaris*) + if test "$prefix" = "/usr" ; then + sysconfdir=/etc + else + sysconfdir=$prefix/etc + fi + ;; + *) + sysconfdir=/etc + ;; + esac +fi + + +# Check whether --with-initd-dir was given. +if test "${with_initd_dir+set}" = set; then : + withval=$with_initd_dir; initd_dir_path=$withval +else + case "$host_os" in + *linux*) + if test -d $sysconfdir/rc.d/init.d ; then + initd_dir_path=$sysconfdir/rc.d/init.d + else + initd_dir_path=$sysconfdir/init.d + fi + ;; + *) + initd_dir_path=$sysconfdir/rc.d + ;; + esac +fi + + + +# Check whether --with-bash_completion-dir was given. +if test "${with_bash_completion_dir+set}" = set; then : + withval=$with_bash_completion_dir; BASH_COMPLETION_DIR=$withval +else + BASH_COMPLETION_DIR=$sysconfdir/bash_completion.d +fi + + BINDIR=$prefix/bin @@ -3689,37 +3761,55 @@ BINDIR=$prefix/bin SBINDIR=$prefix/sbin -LIBEXEC=$prefix/lib/xen/bin +INCLUDEDIR=`eval echo $includedir` -LIBDIR=`eval echo $libdir` +if test "x$libexecdir" = 'x${exec_prefix}/libexec' ; then + case "$host_os" in + *netbsd*) + libexecdir=$prefix/libexec + ;; + *) + libexecdir=$prefix/lib + ;; + esac +fi +LIBEXEC=`eval echo $libexecdir/xen` +LIBEXEC_BIN=$LIBEXEC/bin +LIBEXEC_LIB=$LIBEXEC/lib +LIBEXEC_INC=$LIBEXEC/include +LIBEXEC_BOOT=$LIBEXEC/boot + -XEN_RUN_DIR=/var/run/xen -XEN_LOG_DIR=/var/log/xen +LIBDIR=`eval echo $libdir` -XEN_LIB_STORED=/var/lib/xenstored +XEN_RUN_DIR=$localstatedir/run/xen -SHAREDIR=$prefix/share +XEN_LOG_DIR=$localstatedir/log/xen -PRIVATE_PREFIX=$LIBDIR/xen +XEN_LIB_STORED=$localstatedir/lib/xenstored -PKG_XEN_PREFIX=$LIBDIR/xen + +SHAREDIR=$prefix/share + + +MANDIR=`eval eval echo $mandir` -PRIVATE_BINDIR=$PRIVATE_PREFIX/bin +DOCDIR=`eval eval echo $docdir` -XENFIRMWAREDIR=$prefix/lib/xen/boot +CONFIG_DIR=$sysconfdir -CONFIG_DIR=/etc +INITD_DIR=$initd_dir_path XEN_CONFIG_DIR=$CONFIG_DIR/xen @@ -3728,18 +3818,45 @@ XEN_CONFIG_DIR=$CONFIG_DIR/xen XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts -XEN_LOCK_DIR=/var/lock +case "$host_os" in +*freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;; +*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;; +*) XEN_LOCK_DIR=$localstatedir/lock ;; +esac -XEN_RUN_DIR=/var/run/xen +XEN_RUN_DIR=$localstatedir/run/xen -XEN_PAGING_DIR=/var/lib/xen/xenpaging +XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging # Enable/disable options +# Check whether --enable-rpath was given. +if test "${enable_rpath+set}" = set; then : + enableval=$enable_rpath; +fi + + +if test "x$enable_rpath" = "xno"; then : + + ax_cv_rpath="n" + +elif test "x$enable_rpath" = "xyes"; then : + + ax_cv_rpath="y" + +elif test -z $ax_cv_rpath; then : + + ax_cv_rpath="n" + +fi +rpath=$ax_cv_rpath + + + # Check whether --enable-githttp was given. if test "${enable_githttp+set}" = set; then : enableval=$enable_githttp; @@ -3924,6 +4041,41 @@ blktap1=$ax_cv_blktap1 + +# Check whether --with-linux-backend-modules was given. +if test "${with_linux_backend_modules+set}" = set; then : + withval=$with_linux_backend_modules; LINUX_BACKEND_MODULES="$withval" +else + case "$host_os" in +*linux*) +LINUX_BACKEND_MODULES=" +xen-evtchn +xen-gntdev +xen-gntalloc +xen-blkback +xen-netback +xen-pciback +evtchn +gntdev +netbk +blkbk +xen-scsibk +usbbk +pciback +xen-acpi-processor +blktap2 +blktap +" +;; +*) +LINUX_BACKEND_MODULES= +;; +esac +fi + +LINUX_BACKEND_MODULES="`eval echo $LINUX_BACKEND_MODULES`" + + # Check whether --enable-blktap2 was given. if test "${enable_blktap2+set}" = set; then : enableval=$enable_blktap2; @@ -6014,13 +6166,13 @@ if test "${with_xenstored+set}" = set; then : if test "x$withval" = "xxenstored"; then : xenstore=$withval - xenstored=$SBINDIR/xenstored + xenstored=$LIBEXEC_BIN/xenstored fi if test "x$withval" = "xoxenstored"; then : xenstore=$withval - xenstored=$SBINDIR/oxenstored + xenstored=$LIBEXEC_BIN/oxenstored if test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"; then : @@ -6040,11 +6192,11 @@ else xenstore="oxenstored" - xenstored=$SBINDIR/oxenstored + xenstored=$LIBEXEC_BIN/oxenstored if test "x$OCAMLC" = "xno" || test "x$OCAMLFIND" = "xno"; then : xenstore="xenstored" - xenstored=$SBINDIR/xenstored + xenstored=$LIBEXEC_BIN/xenstored fi @@ -8640,7 +8792,7 @@ fi if test "x$SYSTEMD_DIR" = x; then : - SYSTEMD_DIR="\$(prefix)/lib/systemd/system/" + SYSTEMD_DIR="\$(PREFIX)/lib/systemd/system/" fi @@ -8652,7 +8804,7 @@ fi if test "x$SYSTEMD_MODULES_LOAD" = x; then : - SYSTEMD_MODULES_LOAD="\$(prefix)/lib/modules-load.d/" + SYSTEMD_MODULES_LOAD="\$(PREFIX)/lib/modules-load.d/" fi @@ -9365,17 +9517,25 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "../config/Tools.mk") CONFIG_FILES="$CONFIG_FILES ../config/Tools.mk" ;; - "hotplug/Linux/init.d/xencommons.in") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xencommons.in" ;; + "hotplug/FreeBSD/rc.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/FreeBSD/rc.d/xencommons" ;; "hotplug/Linux/init.d/sysconfig.xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/sysconfig.xencommons" ;; + "hotplug/Linux/init.d/xen-watchdog") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xen-watchdog" ;; + "hotplug/Linux/init.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xencommons" ;; + "hotplug/Linux/init.d/xendomains") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/init.d/xendomains" ;; "hotplug/Linux/systemd/proc-xen.mount") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/proc-xen.mount" ;; "hotplug/Linux/systemd/var-lib-xenstored.mount") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/var-lib-xenstored.mount" ;; - "hotplug/Linux/systemd/xenstored.socket") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/xenstored.socket" ;; - "hotplug/Linux/systemd/xenstored_ro.socket") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/xenstored_ro.socket" ;; - "hotplug/Linux/systemd/xenstored.service") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/xenstored.service" ;; - "hotplug/Linux/systemd/xenconsoled.service") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/xenconsoled.service" ;; "hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service" ;; - "hotplug/Linux/systemd/xendomains.service") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/xendomains.service" ;; "hotplug/Linux/systemd/xen-watchdog.service") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/xen-watchdog.service" ;; + "hotplug/Linux/systemd/xenconsoled.service") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/xenconsoled.service" ;; + "hotplug/Linux/systemd/xendomains.service") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/xendomains.service" ;; + "hotplug/Linux/systemd/xenstored.service") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/xenstored.service" ;; + "hotplug/Linux/systemd/xenstored.socket") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/xenstored.socket" ;; + "hotplug/Linux/systemd/xenstored_ro.socket") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/xenstored_ro.socket" ;; + "hotplug/Linux/vif-setup") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/vif-setup" ;; + "hotplug/Linux/xen-backend.rules") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/xen-backend.rules" ;; + "hotplug/Linux/xen-hotplug-common.sh") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/xen-hotplug-common.sh" ;; + "hotplug/Linux/xendomains") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/xendomains" ;; + "hotplug/NetBSD/rc.d/xencommons") CONFIG_FILES="$CONFIG_FILES hotplug/NetBSD/rc.d/xencommons" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |