[libvirt] [PATCH 0/4] A bit of configure clear-up
Since on the whole it seems like the configure could see some cleanup, as it seem to use lots of older constructs and repeated code, I tried doing some basic cleaning. My changes also require autoconf-2.63… it could be something older as well, but 2.63 is new enough I'd say. If nobody has reasons for 2.59 compatibility to stick around, it would probably improve a lot. HTH! -- Diego
Request use of autoconf 2.63 or later, so that --htmldir (and the htmldir variable) are defined. This makes deciding where to install the HTML documentation more in line with the autoconf standard and other packages. --- configure.in | 12 +----------- docs/Makefile.am | 14 +++++++------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/configure.in b/configure.in index 012a96f..06ab82c 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,5 @@ dnl Process this file with autoconf to produce a configure script. +AC_PREREQ([2.63]) AC_INIT([libvirt], [0.7.5]) AC_CONFIG_SRCDIR([src/libvirt.c]) @@ -180,17 +181,6 @@ if test -n "$MODPROBE"; then [Location or name of the modprobe program]) fi -dnl Specific dir for HTML output ? -AC_ARG_WITH([html-dir], [AC_HELP_STRING([--with-html-dir=path], - [path to base html directory, default $datadir/doc/html])], - [HTML_DIR=$withval], [HTML_DIR='$(datadir)/doc']) - -AC_ARG_WITH([html-subdir], [AC_HELP_STRING([--with-html-subdir=path], - [directory used under html-dir, default $PACKAGE-$VERSION/html])], - [test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"], - [HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"]) -AC_SUBST([HTML_DIR]) - dnl if --prefix is /usr, don't use /usr/var for localstatedir dnl or /usr/etc for sysconfdir dnl as this makes a lot of things break in testing situations diff --git a/docs/Makefile.am b/docs/Makefile.am index c19e963..d7d6779 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -142,22 +142,22 @@ maintainer-clean-local: clean-local rebuild: api all install-data-local: - $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) + $(mkinstalldirs) $(DESTDIR)$(htmldir) -@INSTALL@ -m 0644 $(srcdir)/FAQ.html \ - $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR) - $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html + $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(htmldir) + $(mkinstalldirs) $(DESTDIR)$(htmldir)/html for h in $(apihtml); do \ - $(INSTALL) -m 0644 $(srcdir)/$$h $(DESTDIR)$(HTML_DIR)/html; done + $(INSTALL) -m 0644 $(srcdir)/$$h $(DESTDIR)$(htmldir)/html; done for p in $(apipng); do \ - $(INSTALL) -m 0644 $(srcdir)/$$p $(DESTDIR)$(HTML_DIR)/html; done + $(INSTALL) -m 0644 $(srcdir)/$$p $(DESTDIR)$(htmldir)/html; done $(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR) for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ @INSTALL@ -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ done uninstall-local: - for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done - for p in $(apipng); do rm $(DESTDIR)$(HTML_DIR)/$$p; done + for h in $(apihtml); do rm $(DESTDIR)$(htmldir)/$$h; done + for p in $(apipng); do rm $(DESTDIR)$(htmldir)/$$p; done for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ rm $(DESTDIR)$(DEVHELP_DIR)/$$(basename $$f); \ done -- 1.6.6
Always use AS_HELP_STRING to define the help string for the options, fix proper quoting and quadrigraphs for brackets, and always use the [default=$foo] syntax to show the default (in line with autoconf's own defaults). --- configure.in | 98 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 49 insertions(+), 49 deletions(-) diff --git a/configure.in b/configure.in index 06ab82c..b03b8e3 100644 --- a/configure.in +++ b/configure.in @@ -195,33 +195,33 @@ fi dnl Allow to build without Xen, QEMU/KVM, test or remote driver AC_ARG_WITH([xen], -[ --with-xen add XEN support (on)],[],[with_xen=yes]) + AS_HELP_STRING([--with-xen], [add XEN support @<:@default=yes@:>@]),[],[with_xen=yes]) AC_ARG_WITH([xen-inotify], -[ --with-xen-inotify add XEN inotify support (on)],[],[with_xen_inotify=check]) + AS_HELP_STRING([--with-xen-inotify], [add XEN inotify support @<:@default=yes@:>@]),[],[with_xen_inotify=check]) AC_ARG_WITH([qemu], -[ --with-qemu add QEMU/KVM support (on)],[],[with_qemu=yes]) + AS_HELP_STRING([--with-qemu], [add QEMU/KVM support @<:@default=yes@:>@]),[],[with_qemu=yes]) AC_ARG_WITH([uml], -[ --with-uml add UML support (on)],[],[with_uml=check]) + AS_HELP_STRING([--with-uml], [add UML support @<:@default=yes@:>@]),[],[with_uml=check]) AC_ARG_WITH([openvz], -[ --with-openvz add OpenVZ support (on)],[],[with_openvz=yes]) + AS_HELP_STRING([--with-openvz], [add OpenVZ support @<:@default=yes@:>@]),[],[with_openvz=yes]) AC_ARG_WITH([libssh2], -[ --with-libssh2=[PFX] libssh2 location],[],[with_libssh2=yes]) + AS_HELP_STRING([--with-libssh2=@<:@PFX@:>@], [libssh2 location]),[],[with_libssh2=yes]) AC_ARG_WITH([phyp], -[ --with-phyp=[PFX] add PHYP support (on)],[],[with_phyp=check]) + AS_HELP_STRING([--with-phyp=@<:@PFX@:>@], [add PHYP support @<:@default=yes@:>@]),[],[with_phyp=check]) AC_ARG_WITH([vbox], -[ --with-vbox add VirtualBox support (on)],[],[with_vbox=yes]) + AS_HELP_STRING([--with-vbox], [add VirtualBox support @<:@default=yes@:>@]),[],[with_vbox=yes]) AC_ARG_WITH([lxc], -[ --with-lxc add Linux Container support (on)],[],[with_lxc=check]) + AS_HELP_STRING([--with-lxc], [add Linux Container support @<:@default=yes@:>@]),[],[with_lxc=check]) AC_ARG_WITH([one], -[ --with-one add ONE support (on)],[],[with_one=check]) + AS_HELP_STRING([--with-one], [add ONE support @<:@default=yes@:>@]),[],[with_one=check]) AC_ARG_WITH([esx], -[ --with-esx add ESX support (on)],[],[with_esx=check]) + AS_HELP_STRING([--with-esx], [add ESX support @<:@default=yes@:>@]),[],[with_esx=check]) AC_ARG_WITH([test], -[ --with-test add test driver support (on)],[],[with_test=yes]) + AS_HELP_STRING([--with-test], [add test driver support @<:@default=yes@:>@]),[],[with_test=yes]) AC_ARG_WITH([remote], -[ --with-remote add remote driver support (on)],[],[with_remote=yes]) + AS_HELP_STRING([--with-remote], [add remote driver support @<:@default=yes@:>@]),[],[with_remote=yes]) AC_ARG_WITH([libvirtd], -[ --with-libvirtd add libvirtd support (on)],[],[with_libvirtd=yes]) + AS_HELP_STRING([--with-libvirtd], [add libvirtd support @<:@default=yes@:>@]),[],[with_libvirtd=yes]) dnl dnl specific tests to setup DV devel environments with debug etc ... @@ -235,7 +235,7 @@ AC_SUBST([STATIC_BINARIES]) dnl --enable-debug=(yes|no) AC_ARG_ENABLE([debug], - [AC_HELP_STRING([--enable-debug=no/yes], + [AS_HELP_STRING([--enable-debug=@<:@no|yes@:>@], [enable debugging output])],[],[enable_debug=yes]) AM_CONDITIONAL([ENABLE_DEBUG], test x"$enable_debug" = x"yes") if test x"$enable_debug" = x"yes"; then @@ -244,7 +244,7 @@ fi AC_MSG_CHECKING([where to write libvirtd PID file]) -AC_ARG_WITH([remote-pid-file], [AC_HELP_STRING([--with-remote-pid-file=[pidfile|none]], [PID file for libvirtd])]) +AC_ARG_WITH([remote-pid-file], [AS_HELP_STRING([--with-remote-pid-file=@<:@pidfile|none@:>@], [PID file for libvirtd])]) if test "x$with_remote_pid_file" == "x" ; then REMOTE_PID_FILE="$localstatedir/run/libvirtd.pid" elif test "x$with_remote_pid_file" == "xnone" ; then @@ -260,8 +260,8 @@ dnl init script flavor dnl AC_MSG_CHECKING([for init script flavor]) AC_ARG_WITH([init-script], - [AC_HELP_STRING([--with-init-script=[redhat|auto|none]], - [Style of init script to install (defaults to auto)])]) + [AS_HELP_STRING([--with-init-script=@<:@redhat|auto|none@:>@], + [Style of init script to install @<:@default=auto@:>@])]) if test "x$with_init_script" = "x" -o "x$with_init_script" = "xauto"; then if test -f /etc/redhat-release ; then with_init_script=redhat @@ -274,8 +274,8 @@ AC_MSG_RESULT($with_init_script) dnl RHEL-5 has a peculiar version of Xen, which requires some special casing AC_ARG_WITH([rhel5-api], - [AC_HELP_STRING([--with-rhel5-api=[ARG]], - [build for the RHEL-5 API [default=no]])]) + [AS_HELP_STRING([--with-rhel5-api=@<:@ARG@:>@], + [build for the RHEL-5 API @<:@default=no@:>@])]) if test x"$with_rhel5_api" = x"yes"; then AC_DEFINE([WITH_RHEL5_API], [1], [whether building for the RHEL-5 API]) fi @@ -499,7 +499,7 @@ LIBXML_CFLAGS="" LIBXML_LIBS="" LIBXML_FOUND="no" -AC_ARG_WITH([libxml], [ --with-libxml=[PFX] libxml2 location]) +AC_ARG_WITH([libxml], AS_HELP_STRING([--with-libxml=@<:@PFX@:>@], [libxml2 location])) if test "x$with_libxml" = "xno" ; then AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_REQUIRED) AC_MSG_ERROR([libxml2 >= $LIBXML_REQUIRED is required for libvirt]) @@ -586,7 +586,7 @@ LIBS="$old_libs" dnl Cyrus SASL AC_ARG_WITH([sasl], - [ --with-sasl use cyrus SASL for authentication], + AS_HELP_STRING([--with-sasl], [use cyrus SASL for authentication]), [], [with_sasl=check]) @@ -641,7 +641,7 @@ AC_SUBST([SASL_LIBS]) dnl YAJL JSON library http://lloyd.github.com/yajl/ AC_ARG_WITH([yajl], - [ --with-yajl use YAJL for JSON parsing/formatting], + AS_HELP_STRING([--with-yajl], [use YAJL for JSON parsing/formatting]), [], [with_yajl=check]) @@ -694,7 +694,7 @@ POLKIT_CFLAGS= POLKIT_LIBS= PKCHECK_PATH= AC_ARG_WITH([polkit], - [ --with-polkit use PolicyKit for UNIX socket access checks], + AS_HELP_STRING([--with-polkit], [use PolicyKit for UNIX socket access checks]), [], [with_polkit=check]) @@ -752,7 +752,7 @@ AC_SUBST([POLKIT_LIBS]) dnl Avahi library AC_ARG_WITH([avahi], - [ --with-avahi use avahi to advertise remote daemon], + AS_HELP_STRING([--with-avahi], [use avahi to advertise remote daemon]), [], [with_avahi=check]) @@ -779,7 +779,7 @@ AC_SUBST([AVAHI_LIBS]) dnl SELinux AC_ARG_WITH([selinux], - [ --with-selinux use SELinux to manage security], + AS_HELP_STRING([--with-selinux], [use SELinux to manage security]), [], [with_selinux=check]) @@ -814,7 +814,7 @@ AC_SUBST([SELINUX_LIBS]) AC_ARG_WITH([secdriver-selinux], - [ --with-secdriver-selinux use SELinux security driver], + AS_HELP_STRING([--with-secdriver-selinux], [use SELinux security driver]), [], [with_secdriver_selinux=check]) @@ -852,7 +852,7 @@ AM_CONDITIONAL([WITH_SECDRIVER_SELINUX], [test "$with_secdriver_selinux" != "no" dnl AppArmor AC_ARG_WITH([apparmor], - [ --with-apparmor use AppArmor to manage security], + AS_HELP_STRING([--with-apparmor], [use AppArmor to manage security]), [], [with_apparmor=check]) @@ -891,7 +891,7 @@ AC_SUBST([APPARMOR_LIBS]) AC_ARG_WITH([secdriver-apparmor], - [ --with-secdriver-apparmor use AppArmor security driver], + AS_HELP_STRING([--with-secdriver-apparmor], [use AppArmor security driver]), [], [with_secdriver_apparmor=check]) @@ -930,7 +930,7 @@ AM_CONDITIONAL([WITH_SECDRIVER_APPARMOR], [test "$with_secdriver_apparmor" != "n dnl NUMA lib AC_ARG_WITH([numactl], - [ --with-numactl use numactl for host topology info], + AS_HELP_STRING([--with-numactl], [use numactl for host topology info]), [], [with_numactl=check]) @@ -1065,7 +1065,7 @@ AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"]) dnl libcap-ng AC_ARG_WITH([capng], - [ --with-capng use libcap-ng to reduce libvirtd privileges], + AS_HELP_STRING([--with-capng], [use libcap-ng to reduce libvirtd privileges]), [], [with_capng=check]) @@ -1148,7 +1148,7 @@ AC_SUBST([VIRSH_LIBS]) AC_ARG_WITH([network], -[ --with-network with virtual network driver (on)],[],[with_network=yes]) + AS_HELP_STRING([--with-network], [with virtual network driver @<:@default=yes@:>@]),[],[with_network=yes]) if test "$with_libvirtd" = "no" ; then with_network=no fi @@ -1166,7 +1166,7 @@ AM_CONDITIONAL([WITH_BRIDGE], [test "$with_bridge" = "yes"]) dnl netcf library AC_ARG_WITH([netcf], -[ --with-netcf libnetcf support to configure physical host network interfaces], + AS_HELP_STRING([--with-netcf], [libnetcf support to configure physical host network interfaces]), [], [with_netcf=check]) NETCF_CFLAGS= @@ -1202,17 +1202,17 @@ AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"]) AC_ARG_WITH([storage-fs], -[ --with-storage-fs with FileSystem backend for the storage driver (on)],[],[with_storage_fs=check]) + AS_HELP_STRING([--with-storage-fs], [with FileSystem backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_fs=check]) AC_ARG_WITH([storage-lvm], -[ --with-storage-lvm with LVM backend for the storage driver (on)],[],[with_storage_lvm=check]) + AS_HELP_STRING([--with-storage-lvm], [with LVM backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_lvm=check]) AC_ARG_WITH([storage-iscsi], -[ --with-storage-iscsi with iSCSI backend for the storage driver (on)],[],[with_storage_iscsi=check]) + AS_HELP_STRING([--with-storage-iscsi], [with iSCSI backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_iscsi=check]) AC_ARG_WITH([storage-scsi], -[ --with-storage-scsi with SCSI backend for the storage driver (on)],[],[with_storage_scsi=check]) + AS_HELP_STRING([--with-storage-scsi], [with SCSI backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_scsi=check]) AC_ARG_WITH([storage-mpath], -[ --with-storage-mpath with mpath backend for the storage driver (on)],[],[with_storage_mpath=check]) + AS_HELP_STRING([--with-storage-mpath], [with mpath backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_mpath=check]) AC_ARG_WITH([storage-disk], -[ --with-storage-disk with GPartd Disk backend for the storage driver (on)],[],[with_storage_disk=check]) + AS_HELP_STRING([--with-storage-disk], [with GPartd Disk backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_disk=check]) with_storage_dir=yes if test "$with_libvirtd" = "no"; then @@ -1454,7 +1454,7 @@ dnl check for python dnl AC_ARG_WITH([python], -[ --with-python Build python bindings (on)],[],[with_python=yes]) + AS_HELP_STRING([--with-python], [Build python bindings @<:@default=yes@:>@]),[],[with_python=yes]) if test "$enable_shared:$with_python" = no:yes; then AC_MSG_WARN([Disabling shared libraries is incompatible with building Python extensions.]) @@ -1551,7 +1551,7 @@ AC_MSG_RESULT($RUNNING_XEND) AM_CONDITIONAL([ENABLE_XEN_TESTS], [test "$RUNNING_XEN" != "no" -a "$RUNNING_XEND" != "no"]) AC_ARG_ENABLE([test-coverage], -[ --enable-test-coverage turn on code coverage instrumentation], + AS_HELP_STRING([--enable-test-coverage], [turn on code coverage instrumentation]), [case "${enableval}" in yes|no) ;; *) AC_MSG_ERROR([bad value ${enableval} for test-coverage option]) ;; @@ -1568,7 +1568,7 @@ if test "${enable_coverage}" = yes; then fi AC_ARG_ENABLE([test-oom], -[ --enable-test-oom memory allocation failure checking], + AS_HELP_STRING([--enable-test-oom], [memory allocation failure checking]), [case "${enableval}" in yes|no) ;; *) AC_MSG_ERROR([bad value ${enableval} for test-oom option]) ;; @@ -1588,7 +1588,7 @@ fi AC_ARG_ENABLE([test-locking], -[ --enable-test-locking thread locking tests using CIL], + AS_HELP_STRING([--enable-test-locking], [thread locking tests using CIL]), [case "${enableval}" in yes|no) ;; *) AC_MSG_ERROR([bad value ${enableval} for test-locking option]) ;; @@ -1605,7 +1605,7 @@ AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" = "yes"]) dnl Enable building the proxy? AC_ARG_WITH([xen-proxy], -[ --with-xen-proxy add XEN setuid proxy support (on)],[],[with_xen_proxy=auto]) + AS_HELP_STRING([--with-xen-proxy], [add XEN setuid proxy support @<:@default=yes@:>@]),[],[with_xen_proxy=auto]) AC_MSG_CHECKING([if Xen setuid proxy is needed]) if test "$with_xen_proxy" = "auto"; then @@ -1665,7 +1665,7 @@ AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != "no"]) dnl Driver-Modules library AC_ARG_WITH([driver-modules], - [ --with-driver-modules build drivers as loadable modules], + AS_HELP_STRING([--with-driver-modules], [build drivers as loadable modules]), [], [with_driver_modules=no]) @@ -1704,7 +1704,7 @@ dnl HAL library check for host device enumeration HAL_CFLAGS= HAL_LIBS= AC_ARG_WITH([hal], - [ --with-hal use HAL for host device enumeration], + AS_HELP_STRING([--with-hal], [use HAL for host device enumeration]), [], [with_hal=check]) @@ -1747,7 +1747,7 @@ UDEV_LIBS= PCIACCESS_CFLAGS= PCIACCESS_LIBS= AC_ARG_WITH([udev], - [ --with-udev use libudev for host device enumeration], + AS_HELP_STRING([--with-udev], [use libudev for host device enumeration]), [], [with_udev=check]) @@ -1799,11 +1799,11 @@ AM_CONDITIONAL([WITH_LINUX], [test `uname -s` = "Linux"]) AC_ARG_WITH([qemu-user], - [ --with-qemu-user username to run QEMU system instance as], + AS_HELP_STRING([--with-qemu-user], [username to run QEMU system instance as]), [QEMU_USER=${withval}], [QEMU_USER=root]) AC_ARG_WITH([qemu-group], - [ --with-qemu-group groupname to run QEMU system instance as], + AS_HELP_STRING([--with-qemu-group], [groupname to run QEMU system instance as]), [QEMU_GROUP=${withval}], [QEMU_GROUP=root]) AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account]) -- 1.6.6
This ensures that ./configure will work fine if xen development packages are not around, rather than fail. When passing ./configure --with-xen, the lack of xen development packages become fatal. --- configure.in | 60 ++++++++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 26 deletions(-) diff --git a/configure.in b/configure.in index b03b8e3..18b5429 100644 --- a/configure.in +++ b/configure.in @@ -195,7 +195,7 @@ fi dnl Allow to build without Xen, QEMU/KVM, test or remote driver AC_ARG_WITH([xen], - AS_HELP_STRING([--with-xen], [add XEN support @<:@default=yes@:>@]),[],[with_xen=yes]) + AS_HELP_STRING([--with-xen], [add XEN support @<:@default=auto@:>@]),[],[with_xen=check]) AC_ARG_WITH([xen-inotify], AS_HELP_STRING([--with-xen-inotify], [add XEN inotify support @<:@default=yes@:>@]),[],[with_xen_inotify=check]) AC_ARG_WITH([qemu], @@ -324,6 +324,8 @@ if test "$with_libvirtd" = "yes" ; then fi AM_CONDITIONAL([WITH_LIBVIRTD], [test "$with_libvirtd" = "yes"]) +old_LIBS="$LIBS" +old_CFLAGS="$CFLAGS" XEN_LIBS="" XEN_CFLAGS="" dnl search for the Xen store library @@ -333,52 +335,58 @@ if test "$with_xen" != "no" ; then XEN_LIBS="-L$with_xen/lib64 -L$with_xen/lib" fi fail=0 - old_LIBS="$LIBS" - old_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $XEN_CFLAGS" LIBS="$LIBS $XEN_LIBS" AC_CHECK_LIB([xenstore], [xs_read], [ with_xen=yes XEN_LIBS="$XEN_LIBS -lxenstore" ],[ - if test "$with_xen" = "check" ; then - with_xen=no - else - with_xen=no + if test "$with_xen" = "yes"; then fail=1 fi + with_xen=no ]) +fi - test $fail = 1 && - AC_MSG_ERROR([You must install the Xen development package to compile Xen driver with -lxenstore]) - +if test "$with_xen" != "no" ; then AC_CHECK_HEADERS([xen/xen.h xen/version.h xen/dom0_ops.h],,[ - AC_MSG_ERROR([Cannot find standard Xen headers. Is xen-devel installed?]) + if test "$with_xen" = "yes"; then + fail=1 + fi + with_xen=no ], [#include <stdio.h> #include <stdint.h> ]) +fi +if test "$with_xen" != "no" ; then dnl Search for the location of <xen/{linux,sys}/privcmd.h>. - AC_CHECK_HEADERS([xen/sys/privcmd.h],,[ - AC_CHECK_HEADERS([xen/linux/privcmd.h],,[ - AC_MSG_ERROR([Cannot find header file <xen/linux/privcmd.h> or <xen/sys/privcmd.h>. Is xen-devel installed?]) - ], -[#include <stdio.h> -#include <stdint.h> -#include <xen/xen.h> -]) - ], -[#include <stdio.h> -#include <stdint.h> -#include <xen/xen.h> -]) - LIBS="$old_LIBS" - CFLAGS="$old_CFLAGS" + found= + AC_CHECK_HEADERS([xen/sys/privcmd.h xen/linux/privcmd.h], [found=yes; break;], [], + [#include <stdio.h> + #include <stdint.h> + #include <xen/xen.h> + ]) + if test "x$found" != "xyes"; then + if test "$with_xen" = "yes"; then + fail=1 + fi + with_xen=no + fi fi + +LIBS="$old_LIBS" +CFLAGS="$old_CFLAGS" + +if test $fail = 1; then + AC_MSG_ERROR([You must install the Xen development package to compile Xen driver with -lxenstore]) +fi + if test "$with_xen" = "yes"; then AC_DEFINE_UNQUOTED([WITH_XEN], 1, [whether Xen driver is enabled]) fi + AM_CONDITIONAL([WITH_XEN], [test "$with_xen" = "yes"]) AC_SUBST([XEN_CFLAGS]) AC_SUBST([XEN_LIBS]) -- 1.6.6
Depends on the previous patch requiring autoconf 2.63 or later. --- configure.in | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index 18b5429..385c48b 100644 --- a/configure.in +++ b/configure.in @@ -49,13 +49,6 @@ AC_PROG_CPP AC_OBJEXT -dnl gl_INIT uses m4_foreach_w, yet that is not defined in autoconf-2.59. -dnl In order to accommodate developers with such old tools, here's a -dnl replacement definition. -m4_ifndef([m4_foreach_w], - [m4_define([m4_foreach_w], - [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) - gl_EARLY gl_INIT -- 1.6.6
On Sun, Jan 17, 2010 at 02:21:41AM +0100, Diego Elio Petten? wrote:
Depends on the previous patch requiring autoconf 2.63 or later. --- configure.in | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/configure.in b/configure.in index 18b5429..385c48b 100644 --- a/configure.in +++ b/configure.in @@ -49,13 +49,6 @@ AC_PROG_CPP
AC_OBJEXT
-dnl gl_INIT uses m4_foreach_w, yet that is not defined in autoconf-2.59. -dnl In order to accommodate developers with such old tools, here's a -dnl replacement definition. -m4_ifndef([m4_foreach_w], - [m4_define([m4_foreach_w], - [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) - gl_EARLY gl_INIT
--
NACK to this one too - we added this for compatability with RHEL-5 hosts Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
2010/1/17 Diego Elio Pettenò <flameeyes@gmail.com>:
This ensures that ./configure will work fine if xen development packages are not around, rather than fail. When passing ./configure --with-xen, the lack of xen development packages become fatal. --- configure.in | 60 ++++++++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/configure.in b/configure.in index b03b8e3..18b5429 100644 --- a/configure.in +++ b/configure.in @@ -195,7 +195,7 @@ fi
dnl Allow to build without Xen, QEMU/KVM, test or remote driver AC_ARG_WITH([xen], - AS_HELP_STRING([--with-xen], [add XEN support @<:@default=yes@:>@]),[],[with_xen=yes]) + AS_HELP_STRING([--with-xen], [add XEN support @<:@default=auto@:>@]),[],[with_xen=check])
s/default=auto/default=check/ Matthias
On Sun, Jan 17, 2010 at 02:21:40AM +0100, Diego Elio Petten? wrote:
This ensures that ./configure will work fine if xen development packages are not around, rather than fail. When passing ./configure --with-xen, the lack of xen development packages become fatal. --- configure.in | 60 ++++++++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/configure.in b/configure.in index b03b8e3..18b5429 100644 --- a/configure.in +++ b/configure.in @@ -195,7 +195,7 @@ fi
dnl Allow to build without Xen, QEMU/KVM, test or remote driver AC_ARG_WITH([xen], - AS_HELP_STRING([--with-xen], [add XEN support @<:@default=yes@:>@]),[],[with_xen=yes]) + AS_HELP_STRING([--with-xen], [add XEN support @<:@default=auto@:>@]),[],[with_xen=check]) AC_ARG_WITH([xen-inotify], AS_HELP_STRING([--with-xen-inotify], [add XEN inotify support @<:@default=yes@:>@]),[],[with_xen_inotify=check]) AC_ARG_WITH([qemu], @@ -324,6 +324,8 @@ if test "$with_libvirtd" = "yes" ; then fi AM_CONDITIONAL([WITH_LIBVIRTD], [test "$with_libvirtd" = "yes"])
+old_LIBS="$LIBS" +old_CFLAGS="$CFLAGS" XEN_LIBS="" XEN_CFLAGS="" dnl search for the Xen store library @@ -333,52 +335,58 @@ if test "$with_xen" != "no" ; then XEN_LIBS="-L$with_xen/lib64 -L$with_xen/lib" fi fail=0 - old_LIBS="$LIBS" - old_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $XEN_CFLAGS" LIBS="$LIBS $XEN_LIBS" AC_CHECK_LIB([xenstore], [xs_read], [ with_xen=yes XEN_LIBS="$XEN_LIBS -lxenstore" ],[ - if test "$with_xen" = "check" ; then - with_xen=no - else - with_xen=no + if test "$with_xen" = "yes"; then fail=1 fi + with_xen=no ]) +fi
- test $fail = 1 && - AC_MSG_ERROR([You must install the Xen development package to compile Xen driver with -lxenstore]) - +if test "$with_xen" != "no" ; then AC_CHECK_HEADERS([xen/xen.h xen/version.h xen/dom0_ops.h],,[ - AC_MSG_ERROR([Cannot find standard Xen headers. Is xen-devel installed?]) + if test "$with_xen" = "yes"; then + fail=1 + fi + with_xen=no ], [#include <stdio.h> #include <stdint.h> ]) +fi
+if test "$with_xen" != "no" ; then dnl Search for the location of <xen/{linux,sys}/privcmd.h>. - AC_CHECK_HEADERS([xen/sys/privcmd.h],,[ - AC_CHECK_HEADERS([xen/linux/privcmd.h],,[ - AC_MSG_ERROR([Cannot find header file <xen/linux/privcmd.h> or <xen/sys/privcmd.h>. Is xen-devel installed?]) - ], -[#include <stdio.h> -#include <stdint.h> -#include <xen/xen.h> -]) - ], -[#include <stdio.h> -#include <stdint.h> -#include <xen/xen.h> -]) - LIBS="$old_LIBS" - CFLAGS="$old_CFLAGS" + found= + AC_CHECK_HEADERS([xen/sys/privcmd.h xen/linux/privcmd.h], [found=yes; break;], [], + [#include <stdio.h> + #include <stdint.h> + #include <xen/xen.h> + ]) + if test "x$found" != "xyes"; then + if test "$with_xen" = "yes"; then + fail=1 + fi + with_xen=no + fi fi + +LIBS="$old_LIBS" +CFLAGS="$old_CFLAGS" + +if test $fail = 1; then + AC_MSG_ERROR([You must install the Xen development package to compile Xen driver with -lxenstore]) +fi + if test "$with_xen" = "yes"; then AC_DEFINE_UNQUOTED([WITH_XEN], 1, [whether Xen driver is enabled]) fi + AM_CONDITIONAL([WITH_XEN], [test "$with_xen" = "yes"]) AC_SUBST([XEN_CFLAGS]) AC_SUBST([XEN_LIBS]) --
ACK, making this auto-detect has been long overdue Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
2010/1/17 Diego Elio Pettenò <flameeyes@gmail.com>:
Always use AS_HELP_STRING to define the help string for the options, fix proper quoting and quadrigraphs for brackets, and always use the [default=$foo] syntax to show the default (in line with autoconf's own defaults). --- configure.in | 98 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/configure.in b/configure.in index 06ab82c..b03b8e3 100644 --- a/configure.in +++ b/configure.in @@ -195,33 +195,33 @@ fi
dnl Allow to build without Xen, QEMU/KVM, test or remote driver AC_ARG_WITH([xen], -[ --with-xen add XEN support (on)],[],[with_xen=yes]) + AS_HELP_STRING([--with-xen], [add XEN support @<:@default=yes@:>@]),[],[with_xen=yes]) AC_ARG_WITH([xen-inotify], -[ --with-xen-inotify add XEN inotify support (on)],[],[with_xen_inotify=check]) + AS_HELP_STRING([--with-xen-inotify], [add XEN inotify support @<:@default=yes@:>@]),[],[with_xen_inotify=check])
s/default=yes/default=check/
AC_ARG_WITH([qemu], -[ --with-qemu add QEMU/KVM support (on)],[],[with_qemu=yes]) + AS_HELP_STRING([--with-qemu], [add QEMU/KVM support @<:@default=yes@:>@]),[],[with_qemu=yes]) AC_ARG_WITH([uml], -[ --with-uml add UML support (on)],[],[with_uml=check]) + AS_HELP_STRING([--with-uml], [add UML support @<:@default=yes@:>@]),[],[with_uml=check])
s/default=yes/default=check/
AC_ARG_WITH([openvz], -[ --with-openvz add OpenVZ support (on)],[],[with_openvz=yes]) + AS_HELP_STRING([--with-openvz], [add OpenVZ support @<:@default=yes@:>@]),[],[with_openvz=yes]) AC_ARG_WITH([libssh2], -[ --with-libssh2=[PFX] libssh2 location],[],[with_libssh2=yes]) + AS_HELP_STRING([--with-libssh2=@<:@PFX@:>@], [libssh2 location]),[],[with_libssh2=yes]) AC_ARG_WITH([phyp], -[ --with-phyp=[PFX] add PHYP support (on)],[],[with_phyp=check]) + AS_HELP_STRING([--with-phyp=@<:@PFX@:>@], [add PHYP support @<:@default=yes@:>@]),[],[with_phyp=check])
s/default=yes/default=check/ Also '--with-phyp=@<:@PFX@:>@' should be '--with-phyp' because --with-phyp doesn't accept a path.
AC_ARG_WITH([vbox], -[ --with-vbox add VirtualBox support (on)],[],[with_vbox=yes]) + AS_HELP_STRING([--with-vbox], [add VirtualBox support @<:@default=yes@:>@]),[],[with_vbox=yes]) AC_ARG_WITH([lxc], -[ --with-lxc add Linux Container support (on)],[],[with_lxc=check]) + AS_HELP_STRING([--with-lxc], [add Linux Container support @<:@default=yes@:>@]),[],[with_lxc=check])
s/default=yes/default=check/
AC_ARG_WITH([one], -[ --with-one add ONE support (on)],[],[with_one=check]) + AS_HELP_STRING([--with-one], [add ONE support @<:@default=yes@:>@]),[],[with_one=check])
s/default=yes/default=check/
AC_ARG_WITH([esx], -[ --with-esx add ESX support (on)],[],[with_esx=check]) + AS_HELP_STRING([--with-esx], [add ESX support @<:@default=yes@:>@]),[],[with_esx=check])
s/default=yes/default=check/
AC_ARG_WITH([test], -[ --with-test add test driver support (on)],[],[with_test=yes]) + AS_HELP_STRING([--with-test], [add test driver support @<:@default=yes@:>@]),[],[with_test=yes]) AC_ARG_WITH([remote], -[ --with-remote add remote driver support (on)],[],[with_remote=yes]) + AS_HELP_STRING([--with-remote], [add remote driver support @<:@default=yes@:>@]),[],[with_remote=yes]) AC_ARG_WITH([libvirtd], -[ --with-libvirtd add libvirtd support (on)],[],[with_libvirtd=yes]) + AS_HELP_STRING([--with-libvirtd], [add libvirtd support @<:@default=yes@:>@]),[],[with_libvirtd=yes])
dnl dnl specific tests to setup DV devel environments with debug etc ... @@ -235,7 +235,7 @@ AC_SUBST([STATIC_BINARIES])
dnl --enable-debug=(yes|no) AC_ARG_ENABLE([debug], - [AC_HELP_STRING([--enable-debug=no/yes], + [AS_HELP_STRING([--enable-debug=@<:@no|yes@:>@], [enable debugging output])],[],[enable_debug=yes])
We should denote the default=yes here too: [enable debugging output @<:@default=yes@:>@]
AM_CONDITIONAL([ENABLE_DEBUG], test x"$enable_debug" = x"yes") if test x"$enable_debug" = x"yes"; then @@ -244,7 +244,7 @@ fi
AC_MSG_CHECKING([where to write libvirtd PID file]) -AC_ARG_WITH([remote-pid-file], [AC_HELP_STRING([--with-remote-pid-file=[pidfile|none]], [PID file for libvirtd])]) +AC_ARG_WITH([remote-pid-file], [AS_HELP_STRING([--with-remote-pid-file=@<:@pidfile|none@:>@], [PID file for libvirtd])]) if test "x$with_remote_pid_file" == "x" ; then REMOTE_PID_FILE="$localstatedir/run/libvirtd.pid" elif test "x$with_remote_pid_file" == "xnone" ; then @@ -260,8 +260,8 @@ dnl init script flavor dnl AC_MSG_CHECKING([for init script flavor]) AC_ARG_WITH([init-script], - [AC_HELP_STRING([--with-init-script=[redhat|auto|none]], - [Style of init script to install (defaults to auto)])]) + [AS_HELP_STRING([--with-init-script=@<:@redhat|auto|none@:>@], + [Style of init script to install @<:@default=auto@:>@])]) if test "x$with_init_script" = "x" -o "x$with_init_script" = "xauto"; then if test -f /etc/redhat-release ; then with_init_script=redhat @@ -274,8 +274,8 @@ AC_MSG_RESULT($with_init_script)
dnl RHEL-5 has a peculiar version of Xen, which requires some special casing AC_ARG_WITH([rhel5-api], - [AC_HELP_STRING([--with-rhel5-api=[ARG]], - [build for the RHEL-5 API [default=no]])]) + [AS_HELP_STRING([--with-rhel5-api=@<:@ARG@:>@], + [build for the RHEL-5 API @<:@default=no@:>@])]) if test x"$with_rhel5_api" = x"yes"; then AC_DEFINE([WITH_RHEL5_API], [1], [whether building for the RHEL-5 API]) fi @@ -499,7 +499,7 @@ LIBXML_CFLAGS="" LIBXML_LIBS="" LIBXML_FOUND="no"
-AC_ARG_WITH([libxml], [ --with-libxml=[PFX] libxml2 location]) +AC_ARG_WITH([libxml], AS_HELP_STRING([--with-libxml=@<:@PFX@:>@], [libxml2 location])) if test "x$with_libxml" = "xno" ; then AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_REQUIRED) AC_MSG_ERROR([libxml2 >= $LIBXML_REQUIRED is required for libvirt]) @@ -586,7 +586,7 @@ LIBS="$old_libs"
dnl Cyrus SASL AC_ARG_WITH([sasl], - [ --with-sasl use cyrus SASL for authentication], + AS_HELP_STRING([--with-sasl], [use cyrus SASL for authentication]), [], [with_sasl=check])
We should denote the default=check here too.
@@ -641,7 +641,7 @@ AC_SUBST([SASL_LIBS])
dnl YAJL JSON library http://lloyd.github.com/yajl/ AC_ARG_WITH([yajl], - [ --with-yajl use YAJL for JSON parsing/formatting], + AS_HELP_STRING([--with-yajl], [use YAJL for JSON parsing/formatting]), [], [with_yajl=check])
We should denote the default=check here too.
@@ -694,7 +694,7 @@ POLKIT_CFLAGS= POLKIT_LIBS= PKCHECK_PATH= AC_ARG_WITH([polkit], - [ --with-polkit use PolicyKit for UNIX socket access checks], + AS_HELP_STRING([--with-polkit], [use PolicyKit for UNIX socket access checks]), [], [with_polkit=check])
We should denote the default=check here too.
@@ -752,7 +752,7 @@ AC_SUBST([POLKIT_LIBS])
dnl Avahi library AC_ARG_WITH([avahi], - [ --with-avahi use avahi to advertise remote daemon], + AS_HELP_STRING([--with-avahi], [use avahi to advertise remote daemon]), [], [with_avahi=check])
We should denote the default=check here too.
@@ -779,7 +779,7 @@ AC_SUBST([AVAHI_LIBS])
dnl SELinux AC_ARG_WITH([selinux], - [ --with-selinux use SELinux to manage security], + AS_HELP_STRING([--with-selinux], [use SELinux to manage security]), [], [with_selinux=check])
We should denote the default=check here too.
@@ -814,7 +814,7 @@ AC_SUBST([SELINUX_LIBS])
AC_ARG_WITH([secdriver-selinux], - [ --with-secdriver-selinux use SELinux security driver], + AS_HELP_STRING([--with-secdriver-selinux], [use SELinux security driver]), [], [with_secdriver_selinux=check])
We should denote the default=check here too.
@@ -852,7 +852,7 @@ AM_CONDITIONAL([WITH_SECDRIVER_SELINUX], [test "$with_secdriver_selinux" != "no"
dnl AppArmor AC_ARG_WITH([apparmor], - [ --with-apparmor use AppArmor to manage security], + AS_HELP_STRING([--with-apparmor], [use AppArmor to manage security]), [], [with_apparmor=check])
We should denote the default=check here too.
@@ -891,7 +891,7 @@ AC_SUBST([APPARMOR_LIBS])
AC_ARG_WITH([secdriver-apparmor], - [ --with-secdriver-apparmor use AppArmor security driver], + AS_HELP_STRING([--with-secdriver-apparmor], [use AppArmor security driver]), [], [with_secdriver_apparmor=check])
We should denote the default=check here too.
@@ -930,7 +930,7 @@ AM_CONDITIONAL([WITH_SECDRIVER_APPARMOR], [test "$with_secdriver_apparmor" != "n
dnl NUMA lib AC_ARG_WITH([numactl], - [ --with-numactl use numactl for host topology info], + AS_HELP_STRING([--with-numactl], [use numactl for host topology info]), [], [with_numactl=check])
We should denote the default=check here too.
@@ -1065,7 +1065,7 @@ AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"])
dnl libcap-ng AC_ARG_WITH([capng], - [ --with-capng use libcap-ng to reduce libvirtd privileges], + AS_HELP_STRING([--with-capng], [use libcap-ng to reduce libvirtd privileges]), [], [with_capng=check])
We should denote the default=check here too.
@@ -1148,7 +1148,7 @@ AC_SUBST([VIRSH_LIBS])
AC_ARG_WITH([network], -[ --with-network with virtual network driver (on)],[],[with_network=yes]) + AS_HELP_STRING([--with-network], [with virtual network driver @<:@default=yes@:>@]),[],[with_network=yes]) if test "$with_libvirtd" = "no" ; then with_network=no fi @@ -1166,7 +1166,7 @@ AM_CONDITIONAL([WITH_BRIDGE], [test "$with_bridge" = "yes"])
dnl netcf library AC_ARG_WITH([netcf], -[ --with-netcf libnetcf support to configure physical host network interfaces], + AS_HELP_STRING([--with-netcf], [libnetcf support to configure physical host network interfaces]), [], [with_netcf=check])
We should denote the default=check here too.
NETCF_CFLAGS= @@ -1202,17 +1202,17 @@ AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"])
AC_ARG_WITH([storage-fs], -[ --with-storage-fs with FileSystem backend for the storage driver (on)],[],[with_storage_fs=check]) + AS_HELP_STRING([--with-storage-fs], [with FileSystem backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_fs=check])
s/default=yes/default=check/
AC_ARG_WITH([storage-lvm], -[ --with-storage-lvm with LVM backend for the storage driver (on)],[],[with_storage_lvm=check]) + AS_HELP_STRING([--with-storage-lvm], [with LVM backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_lvm=check])
s/default=yes/default=check/
AC_ARG_WITH([storage-iscsi], -[ --with-storage-iscsi with iSCSI backend for the storage driver (on)],[],[with_storage_iscsi=check]) + AS_HELP_STRING([--with-storage-iscsi], [with iSCSI backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_iscsi=check])
s/default=yes/default=check/
AC_ARG_WITH([storage-scsi], -[ --with-storage-scsi with SCSI backend for the storage driver (on)],[],[with_storage_scsi=check]) + AS_HELP_STRING([--with-storage-scsi], [with SCSI backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_scsi=check])
s/default=yes/default=check/
AC_ARG_WITH([storage-mpath], -[ --with-storage-mpath with mpath backend for the storage driver (on)],[],[with_storage_mpath=check]) + AS_HELP_STRING([--with-storage-mpath], [with mpath backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_mpath=check])
s/default=yes/default=check/
AC_ARG_WITH([storage-disk], -[ --with-storage-disk with GPartd Disk backend for the storage driver (on)],[],[with_storage_disk=check]) + AS_HELP_STRING([--with-storage-disk], [with GPartd Disk backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_disk=check])
s/default=yes/default=check/
with_storage_dir=yes if test "$with_libvirtd" = "no"; then @@ -1454,7 +1454,7 @@ dnl check for python dnl
AC_ARG_WITH([python], -[ --with-python Build python bindings (on)],[],[with_python=yes]) + AS_HELP_STRING([--with-python], [Build python bindings @<:@default=yes@:>@]),[],[with_python=yes])
if test "$enable_shared:$with_python" = no:yes; then AC_MSG_WARN([Disabling shared libraries is incompatible with building Python extensions.]) @@ -1551,7 +1551,7 @@ AC_MSG_RESULT($RUNNING_XEND) AM_CONDITIONAL([ENABLE_XEN_TESTS], [test "$RUNNING_XEN" != "no" -a "$RUNNING_XEND" != "no"])
AC_ARG_ENABLE([test-coverage], -[ --enable-test-coverage turn on code coverage instrumentation], + AS_HELP_STRING([--enable-test-coverage], [turn on code coverage instrumentation]),
We should denote the default=no here too.
[case "${enableval}" in yes|no) ;; *) AC_MSG_ERROR([bad value ${enableval} for test-coverage option]) ;; @@ -1568,7 +1568,7 @@ if test "${enable_coverage}" = yes; then fi
AC_ARG_ENABLE([test-oom], -[ --enable-test-oom memory allocation failure checking], + AS_HELP_STRING([--enable-test-oom], [memory allocation failure checking]),
We should denote the default=no here too.
[case "${enableval}" in yes|no) ;; *) AC_MSG_ERROR([bad value ${enableval} for test-oom option]) ;; @@ -1588,7 +1588,7 @@ fi
AC_ARG_ENABLE([test-locking], -[ --enable-test-locking thread locking tests using CIL], + AS_HELP_STRING([--enable-test-locking], [thread locking tests using CIL]),
We should denote the default=no here too.
[case "${enableval}" in yes|no) ;; *) AC_MSG_ERROR([bad value ${enableval} for test-locking option]) ;; @@ -1605,7 +1605,7 @@ AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" = "yes"]) dnl Enable building the proxy?
AC_ARG_WITH([xen-proxy], -[ --with-xen-proxy add XEN setuid proxy support (on)],[],[with_xen_proxy=auto]) + AS_HELP_STRING([--with-xen-proxy], [add XEN setuid proxy support @<:@default=yes@:>@]),[],[with_xen_proxy=auto])
s/default=yes/default=auto/ I think we should rename auto to check here, because the rest of configure uses the word check for this.
AC_MSG_CHECKING([if Xen setuid proxy is needed]) if test "$with_xen_proxy" = "auto"; then @@ -1665,7 +1665,7 @@ AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != "no"])
dnl Driver-Modules library AC_ARG_WITH([driver-modules], - [ --with-driver-modules build drivers as loadable modules], + AS_HELP_STRING([--with-driver-modules], [build drivers as loadable modules]), [], [with_driver_modules=no])
We should denote the default=no here too.
@@ -1704,7 +1704,7 @@ dnl HAL library check for host device enumeration HAL_CFLAGS= HAL_LIBS= AC_ARG_WITH([hal], - [ --with-hal use HAL for host device enumeration], + AS_HELP_STRING([--with-hal], [use HAL for host device enumeration]), [], [with_hal=check])
We should denote the default=check here too.
@@ -1747,7 +1747,7 @@ UDEV_LIBS= PCIACCESS_CFLAGS= PCIACCESS_LIBS= AC_ARG_WITH([udev], - [ --with-udev use libudev for host device enumeration], + AS_HELP_STRING([--with-udev], [use libudev for host device enumeration]), [], [with_udev=check])
We should denote the default=check here too.
@@ -1799,11 +1799,11 @@ AM_CONDITIONAL([WITH_LINUX], [test `uname -s` = "Linux"])
AC_ARG_WITH([qemu-user], - [ --with-qemu-user username to run QEMU system instance as], + AS_HELP_STRING([--with-qemu-user], [username to run QEMU system instance as]), [QEMU_USER=${withval}], [QEMU_USER=root])
We should denote the default=root here too.
AC_ARG_WITH([qemu-group], - [ --with-qemu-group groupname to run QEMU system instance as], + AS_HELP_STRING([--with-qemu-group], [groupname to run QEMU system instance as]), [QEMU_GROUP=${withval}], [QEMU_GROUP=root])
We should denote the default=root here too.
AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account]) -- 1.6.6
Matthias
Il giorno dom, 17/01/2010 alle 13.22 +0100, Matthias Bolte ha scritto:
AC_ARG_WITH([xen-proxy], -[ --with-xen-proxy add XEN setuid proxy support (on)],[],[with_xen_proxy=auto]) + AS_HELP_STRING([--with-xen-proxy], [add XEN setuid proxy support @<:@default=yes@:>@]),[],[with_xen_proxy=auto])
s/default=yes/default=auto/
I think we should rename auto to check here, because the rest of configure uses the word check for this.
I'm not sure about this because the way it works here is quite different from how it works on the parts where check is used… -- Diego Elio Pettenò — “Flameeyes” http://blog.flameeyes.eu/ If you found a .asc file in this mail and know not what it is, it's a GnuPG digital signature: http://www.gnupg.org/
2010/1/17 Diego Elio “Flameeyes” <flameeyes@gmail.com>:
Il giorno dom, 17/01/2010 alle 13.22 +0100, Matthias Bolte ha scritto:
AC_ARG_WITH([xen-proxy], -[ --with-xen-proxy add XEN setuid proxy support (on)],[],[with_xen_proxy=auto]) + AS_HELP_STRING([--with-xen-proxy], [add XEN setuid proxy support @<:@default=yes@:>@]),[],[with_xen_proxy=auto])
s/default=yes/default=auto/
I think we should rename auto to check here, because the rest of configure uses the word check for this.
I'm not sure about this because the way it works here is quite different from how it works on the parts where check is used…
-- Diego Elio Pettenò — “Flameeyes” http://blog.flameeyes.eu/
Okay, you are right, the test is different here. I'm fine with auto. Matthias
On Sun, Jan 17, 2010 at 02:21:39AM +0100, Diego Elio Petten? wrote:
Always use AS_HELP_STRING to define the help string for the options, fix proper quoting and quadrigraphs for brackets, and always use the [default=$foo] syntax to show the default (in line with autoconf's own defaults). --- configure.in | 98 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/configure.in b/configure.in index 06ab82c..b03b8e3 100644 --- a/configure.in +++ b/configure.in @@ -195,33 +195,33 @@ fi
dnl Allow to build without Xen, QEMU/KVM, test or remote driver AC_ARG_WITH([xen], -[ --with-xen add XEN support (on)],[],[with_xen=yes]) + AS_HELP_STRING([--with-xen], [add XEN support @<:@default=yes@:>@]),[],[with_xen=yes]) AC_ARG_WITH([xen-inotify], -[ --with-xen-inotify add XEN inotify support (on)],[],[with_xen_inotify=check]) + AS_HELP_STRING([--with-xen-inotify], [add XEN inotify support @<:@default=yes@:>@]),[],[with_xen_inotify=check]) AC_ARG_WITH([qemu], -[ --with-qemu add QEMU/KVM support (on)],[],[with_qemu=yes]) + AS_HELP_STRING([--with-qemu], [add QEMU/KVM support @<:@default=yes@:>@]),[],[with_qemu=yes]) AC_ARG_WITH([uml], -[ --with-uml add UML support (on)],[],[with_uml=check]) + AS_HELP_STRING([--with-uml], [add UML support @<:@default=yes@:>@]),[],[with_uml=check]) AC_ARG_WITH([openvz], -[ --with-openvz add OpenVZ support (on)],[],[with_openvz=yes]) + AS_HELP_STRING([--with-openvz], [add OpenVZ support @<:@default=yes@:>@]),[],[with_openvz=yes]) AC_ARG_WITH([libssh2], -[ --with-libssh2=[PFX] libssh2 location],[],[with_libssh2=yes]) + AS_HELP_STRING([--with-libssh2=@<:@PFX@:>@], [libssh2 location]),[],[with_libssh2=yes]) AC_ARG_WITH([phyp], -[ --with-phyp=[PFX] add PHYP support (on)],[],[with_phyp=check]) + AS_HELP_STRING([--with-phyp=@<:@PFX@:>@], [add PHYP support @<:@default=yes@:>@]),[],[with_phyp=check]) AC_ARG_WITH([vbox], -[ --with-vbox add VirtualBox support (on)],[],[with_vbox=yes]) + AS_HELP_STRING([--with-vbox], [add VirtualBox support @<:@default=yes@:>@]),[],[with_vbox=yes]) AC_ARG_WITH([lxc], -[ --with-lxc add Linux Container support (on)],[],[with_lxc=check]) + AS_HELP_STRING([--with-lxc], [add Linux Container support @<:@default=yes@:>@]),[],[with_lxc=check]) AC_ARG_WITH([one], -[ --with-one add ONE support (on)],[],[with_one=check]) + AS_HELP_STRING([--with-one], [add ONE support @<:@default=yes@:>@]),[],[with_one=check]) AC_ARG_WITH([esx], -[ --with-esx add ESX support (on)],[],[with_esx=check]) + AS_HELP_STRING([--with-esx], [add ESX support @<:@default=yes@:>@]),[],[with_esx=check]) AC_ARG_WITH([test], -[ --with-test add test driver support (on)],[],[with_test=yes]) + AS_HELP_STRING([--with-test], [add test driver support @<:@default=yes@:>@]),[],[with_test=yes]) AC_ARG_WITH([remote], -[ --with-remote add remote driver support (on)],[],[with_remote=yes]) + AS_HELP_STRING([--with-remote], [add remote driver support @<:@default=yes@:>@]),[],[with_remote=yes]) AC_ARG_WITH([libvirtd], -[ --with-libvirtd add libvirtd support (on)],[],[with_libvirtd=yes]) + AS_HELP_STRING([--with-libvirtd], [add libvirtd support @<:@default=yes@:>@]),[],[with_libvirtd=yes])
dnl dnl specific tests to setup DV devel environments with debug etc ... @@ -235,7 +235,7 @@ AC_SUBST([STATIC_BINARIES])
dnl --enable-debug=(yes|no) AC_ARG_ENABLE([debug], - [AC_HELP_STRING([--enable-debug=no/yes], + [AS_HELP_STRING([--enable-debug=@<:@no|yes@:>@], [enable debugging output])],[],[enable_debug=yes]) AM_CONDITIONAL([ENABLE_DEBUG], test x"$enable_debug" = x"yes") if test x"$enable_debug" = x"yes"; then @@ -244,7 +244,7 @@ fi
AC_MSG_CHECKING([where to write libvirtd PID file]) -AC_ARG_WITH([remote-pid-file], [AC_HELP_STRING([--with-remote-pid-file=[pidfile|none]], [PID file for libvirtd])]) +AC_ARG_WITH([remote-pid-file], [AS_HELP_STRING([--with-remote-pid-file=@<:@pidfile|none@:>@], [PID file for libvirtd])]) if test "x$with_remote_pid_file" == "x" ; then REMOTE_PID_FILE="$localstatedir/run/libvirtd.pid" elif test "x$with_remote_pid_file" == "xnone" ; then @@ -260,8 +260,8 @@ dnl init script flavor dnl AC_MSG_CHECKING([for init script flavor]) AC_ARG_WITH([init-script], - [AC_HELP_STRING([--with-init-script=[redhat|auto|none]], - [Style of init script to install (defaults to auto)])]) + [AS_HELP_STRING([--with-init-script=@<:@redhat|auto|none@:>@], + [Style of init script to install @<:@default=auto@:>@])]) if test "x$with_init_script" = "x" -o "x$with_init_script" = "xauto"; then if test -f /etc/redhat-release ; then with_init_script=redhat @@ -274,8 +274,8 @@ AC_MSG_RESULT($with_init_script)
dnl RHEL-5 has a peculiar version of Xen, which requires some special casing AC_ARG_WITH([rhel5-api], - [AC_HELP_STRING([--with-rhel5-api=[ARG]], - [build for the RHEL-5 API [default=no]])]) + [AS_HELP_STRING([--with-rhel5-api=@<:@ARG@:>@], + [build for the RHEL-5 API @<:@default=no@:>@])]) if test x"$with_rhel5_api" = x"yes"; then AC_DEFINE([WITH_RHEL5_API], [1], [whether building for the RHEL-5 API]) fi @@ -499,7 +499,7 @@ LIBXML_CFLAGS="" LIBXML_LIBS="" LIBXML_FOUND="no"
-AC_ARG_WITH([libxml], [ --with-libxml=[PFX] libxml2 location]) +AC_ARG_WITH([libxml], AS_HELP_STRING([--with-libxml=@<:@PFX@:>@], [libxml2 location])) if test "x$with_libxml" = "xno" ; then AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_REQUIRED) AC_MSG_ERROR([libxml2 >= $LIBXML_REQUIRED is required for libvirt]) @@ -586,7 +586,7 @@ LIBS="$old_libs"
dnl Cyrus SASL AC_ARG_WITH([sasl], - [ --with-sasl use cyrus SASL for authentication], + AS_HELP_STRING([--with-sasl], [use cyrus SASL for authentication]), [], [with_sasl=check])
@@ -641,7 +641,7 @@ AC_SUBST([SASL_LIBS])
dnl YAJL JSON library http://lloyd.github.com/yajl/ AC_ARG_WITH([yajl], - [ --with-yajl use YAJL for JSON parsing/formatting], + AS_HELP_STRING([--with-yajl], [use YAJL for JSON parsing/formatting]), [], [with_yajl=check])
@@ -694,7 +694,7 @@ POLKIT_CFLAGS= POLKIT_LIBS= PKCHECK_PATH= AC_ARG_WITH([polkit], - [ --with-polkit use PolicyKit for UNIX socket access checks], + AS_HELP_STRING([--with-polkit], [use PolicyKit for UNIX socket access checks]), [], [with_polkit=check])
@@ -752,7 +752,7 @@ AC_SUBST([POLKIT_LIBS])
dnl Avahi library AC_ARG_WITH([avahi], - [ --with-avahi use avahi to advertise remote daemon], + AS_HELP_STRING([--with-avahi], [use avahi to advertise remote daemon]), [], [with_avahi=check])
@@ -779,7 +779,7 @@ AC_SUBST([AVAHI_LIBS])
dnl SELinux AC_ARG_WITH([selinux], - [ --with-selinux use SELinux to manage security], + AS_HELP_STRING([--with-selinux], [use SELinux to manage security]), [], [with_selinux=check])
@@ -814,7 +814,7 @@ AC_SUBST([SELINUX_LIBS])
AC_ARG_WITH([secdriver-selinux], - [ --with-secdriver-selinux use SELinux security driver], + AS_HELP_STRING([--with-secdriver-selinux], [use SELinux security driver]), [], [with_secdriver_selinux=check])
@@ -852,7 +852,7 @@ AM_CONDITIONAL([WITH_SECDRIVER_SELINUX], [test "$with_secdriver_selinux" != "no"
dnl AppArmor AC_ARG_WITH([apparmor], - [ --with-apparmor use AppArmor to manage security], + AS_HELP_STRING([--with-apparmor], [use AppArmor to manage security]), [], [with_apparmor=check])
@@ -891,7 +891,7 @@ AC_SUBST([APPARMOR_LIBS])
AC_ARG_WITH([secdriver-apparmor], - [ --with-secdriver-apparmor use AppArmor security driver], + AS_HELP_STRING([--with-secdriver-apparmor], [use AppArmor security driver]), [], [with_secdriver_apparmor=check])
@@ -930,7 +930,7 @@ AM_CONDITIONAL([WITH_SECDRIVER_APPARMOR], [test "$with_secdriver_apparmor" != "n
dnl NUMA lib AC_ARG_WITH([numactl], - [ --with-numactl use numactl for host topology info], + AS_HELP_STRING([--with-numactl], [use numactl for host topology info]), [], [with_numactl=check])
@@ -1065,7 +1065,7 @@ AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"])
dnl libcap-ng AC_ARG_WITH([capng], - [ --with-capng use libcap-ng to reduce libvirtd privileges], + AS_HELP_STRING([--with-capng], [use libcap-ng to reduce libvirtd privileges]), [], [with_capng=check])
@@ -1148,7 +1148,7 @@ AC_SUBST([VIRSH_LIBS])
AC_ARG_WITH([network], -[ --with-network with virtual network driver (on)],[],[with_network=yes]) + AS_HELP_STRING([--with-network], [with virtual network driver @<:@default=yes@:>@]),[],[with_network=yes]) if test "$with_libvirtd" = "no" ; then with_network=no fi @@ -1166,7 +1166,7 @@ AM_CONDITIONAL([WITH_BRIDGE], [test "$with_bridge" = "yes"])
dnl netcf library AC_ARG_WITH([netcf], -[ --with-netcf libnetcf support to configure physical host network interfaces], + AS_HELP_STRING([--with-netcf], [libnetcf support to configure physical host network interfaces]), [], [with_netcf=check])
NETCF_CFLAGS= @@ -1202,17 +1202,17 @@ AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"])
AC_ARG_WITH([storage-fs], -[ --with-storage-fs with FileSystem backend for the storage driver (on)],[],[with_storage_fs=check]) + AS_HELP_STRING([--with-storage-fs], [with FileSystem backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_fs=check]) AC_ARG_WITH([storage-lvm], -[ --with-storage-lvm with LVM backend for the storage driver (on)],[],[with_storage_lvm=check]) + AS_HELP_STRING([--with-storage-lvm], [with LVM backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_lvm=check]) AC_ARG_WITH([storage-iscsi], -[ --with-storage-iscsi with iSCSI backend for the storage driver (on)],[],[with_storage_iscsi=check]) + AS_HELP_STRING([--with-storage-iscsi], [with iSCSI backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_iscsi=check]) AC_ARG_WITH([storage-scsi], -[ --with-storage-scsi with SCSI backend for the storage driver (on)],[],[with_storage_scsi=check]) + AS_HELP_STRING([--with-storage-scsi], [with SCSI backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_scsi=check]) AC_ARG_WITH([storage-mpath], -[ --with-storage-mpath with mpath backend for the storage driver (on)],[],[with_storage_mpath=check]) + AS_HELP_STRING([--with-storage-mpath], [with mpath backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_mpath=check]) AC_ARG_WITH([storage-disk], -[ --with-storage-disk with GPartd Disk backend for the storage driver (on)],[],[with_storage_disk=check]) + AS_HELP_STRING([--with-storage-disk], [with GPartd Disk backend for the storage driver @<:@default=yes@:>@]),[],[with_storage_disk=check])
with_storage_dir=yes if test "$with_libvirtd" = "no"; then @@ -1454,7 +1454,7 @@ dnl check for python dnl
AC_ARG_WITH([python], -[ --with-python Build python bindings (on)],[],[with_python=yes]) + AS_HELP_STRING([--with-python], [Build python bindings @<:@default=yes@:>@]),[],[with_python=yes])
if test "$enable_shared:$with_python" = no:yes; then AC_MSG_WARN([Disabling shared libraries is incompatible with building Python extensions.]) @@ -1551,7 +1551,7 @@ AC_MSG_RESULT($RUNNING_XEND) AM_CONDITIONAL([ENABLE_XEN_TESTS], [test "$RUNNING_XEN" != "no" -a "$RUNNING_XEND" != "no"])
AC_ARG_ENABLE([test-coverage], -[ --enable-test-coverage turn on code coverage instrumentation], + AS_HELP_STRING([--enable-test-coverage], [turn on code coverage instrumentation]), [case "${enableval}" in yes|no) ;; *) AC_MSG_ERROR([bad value ${enableval} for test-coverage option]) ;; @@ -1568,7 +1568,7 @@ if test "${enable_coverage}" = yes; then fi
AC_ARG_ENABLE([test-oom], -[ --enable-test-oom memory allocation failure checking], + AS_HELP_STRING([--enable-test-oom], [memory allocation failure checking]), [case "${enableval}" in yes|no) ;; *) AC_MSG_ERROR([bad value ${enableval} for test-oom option]) ;; @@ -1588,7 +1588,7 @@ fi
AC_ARG_ENABLE([test-locking], -[ --enable-test-locking thread locking tests using CIL], + AS_HELP_STRING([--enable-test-locking], [thread locking tests using CIL]), [case "${enableval}" in yes|no) ;; *) AC_MSG_ERROR([bad value ${enableval} for test-locking option]) ;; @@ -1605,7 +1605,7 @@ AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" = "yes"]) dnl Enable building the proxy?
AC_ARG_WITH([xen-proxy], -[ --with-xen-proxy add XEN setuid proxy support (on)],[],[with_xen_proxy=auto]) + AS_HELP_STRING([--with-xen-proxy], [add XEN setuid proxy support @<:@default=yes@:>@]),[],[with_xen_proxy=auto])
AC_MSG_CHECKING([if Xen setuid proxy is needed]) if test "$with_xen_proxy" = "auto"; then @@ -1665,7 +1665,7 @@ AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != "no"])
dnl Driver-Modules library AC_ARG_WITH([driver-modules], - [ --with-driver-modules build drivers as loadable modules], + AS_HELP_STRING([--with-driver-modules], [build drivers as loadable modules]), [], [with_driver_modules=no])
@@ -1704,7 +1704,7 @@ dnl HAL library check for host device enumeration HAL_CFLAGS= HAL_LIBS= AC_ARG_WITH([hal], - [ --with-hal use HAL for host device enumeration], + AS_HELP_STRING([--with-hal], [use HAL for host device enumeration]), [], [with_hal=check])
@@ -1747,7 +1747,7 @@ UDEV_LIBS= PCIACCESS_CFLAGS= PCIACCESS_LIBS= AC_ARG_WITH([udev], - [ --with-udev use libudev for host device enumeration], + AS_HELP_STRING([--with-udev], [use libudev for host device enumeration]), [], [with_udev=check])
@@ -1799,11 +1799,11 @@ AM_CONDITIONAL([WITH_LINUX], [test `uname -s` = "Linux"])
AC_ARG_WITH([qemu-user], - [ --with-qemu-user username to run QEMU system instance as], + AS_HELP_STRING([--with-qemu-user], [username to run QEMU system instance as]), [QEMU_USER=${withval}], [QEMU_USER=root]) AC_ARG_WITH([qemu-group], - [ --with-qemu-group groupname to run QEMU system instance as], + AS_HELP_STRING([--with-qemu-group], [groupname to run QEMU system instance as]), [QEMU_GROUP=${withval}], [QEMU_GROUP=root]) AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account]) --
This patch looks good, if it is updated for the minor issues Matthias pointed out Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
On Sun, Jan 17, 2010 at 02:21:38AM +0100, Diego Elio Petten? wrote:
Request use of autoconf 2.63 or later, so that --htmldir (and the htmldir variable) are defined. This makes deciding where to install the HTML documentation more in line with the autoconf standard and other packages.
I'm afraid I'll have to NACK this patch, because we need to be able to bootstrap on a RHEL-5 host, which is autoconf-2.59 / automake-1.9.6 Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
On Sun, Jan 17, 2010 at 02:21:37AM +0100, Diego Elio Petten? wrote:
Since on the whole it seems like the configure could see some cleanup, as it seem to use lots of older constructs and repeated code, I tried doing some basic cleaning.
Agreed, that it is in need of some cleanup. One of the ideas I've thought about is to split up the configure.ac script into a set of macros since the main file is faaaar to large now eg in the m4/ directory we could have check-qemu.m4 check-xen.m4 check-storage.m4 check-... ...etc.. .. one file for each logically indepdant block of m4 code from configure.ac Then, in the configure.ac file we'd just end up with a set of single line calls into these files loooking like LIBVIRT_CHECK_QEMU LIBVIRT_CHECK_XEN LIBVIRT_CHECK_STORAGE .... this should make it much easier to follow what's going on in the configure.ac script Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
Il giorno dom, 17/01/2010 alle 12.48 +0000, Daniel P. Berrange ha scritto:
.. one file for each logically indepdant block of m4 code from configure.ac Then, in the configure.ac file we'd just end up with a set of single line calls into these files loooking like
From one point of view I agree, but I know by experience that this tends
to make the various part of the code not in sync one with the other, the result being code repeated and other problems like that. One of the things that I always wanted to work on is a central repository of macros to make autoconf more… sane. Half the AC_ARG_* calls in this configure.in should likely be used from a single macro that encompasses both AC_ARG and AC_HELP, sets the default and validates boolean and tri/state choices. [And in general, the default AC_ARG macros are quite braindamaged, IMHO]
-- Diego Elio Pettenò — “Flameeyes” http://blog.flameeyes.eu/ If you found a .asc file in this mail and know not what it is, it's a GnuPG digital signature: http://www.gnupg.org/
participants (4)
-
Daniel P. Berrange -
Diego Elio Pettenò -
Diego Elio “Flameeyes” Pettenò
-
Matthias Bolte