1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

configure: autoreconf

Just rebuild after configure.in update.
This commit is contained in:
Zdenek Kabelac 2014-10-30 17:07:58 +01:00
parent e0164f2188
commit e6e647489d
2 changed files with 129 additions and 71 deletions

2
aclocal.m4 vendored
View File

@ -1,4 +1,4 @@
# generated automatically by aclocal 1.13.4 -*- Autoconf -*- # generated automatically by aclocal 1.14.1 -*- Autoconf -*-
# Copyright (C) 1996-2013 Free Software Foundation, Inc. # Copyright (C) 1996-2013 Free Software Foundation, Inc.

190
configure vendored
View File

@ -697,16 +697,19 @@ DMEVENTD_PATH
DMEVENTD DMEVENTD
DL_LIBS DL_LIBS
DEVMAPPER DEVMAPPER
DEFAULT_SYS_DIR
DEFAULT_SPARSE_SEGTYPE
DEFAULT_RUN_DIR DEFAULT_RUN_DIR
DEFAULT_PID_DIR DEFAULT_RAID10_SEGTYPE
DEFAULT_DM_RUN_DIR
DEFAULT_LOCK_DIR
DEFAULT_DATA_ALIGNMENT
DEFAULT_PROFILE_SUBDIR DEFAULT_PROFILE_SUBDIR
DEFAULT_PID_DIR
DEFAULT_MIRROR_SEGTYPE
DEFAULT_LOCK_DIR
DEFAULT_DM_RUN_DIR
DEFAULT_DATA_ALIGNMENT
DEFAULT_CACHE_SUBDIR DEFAULT_CACHE_SUBDIR
DEFAULT_BACKUP_SUBDIR DEFAULT_BACKUP_SUBDIR
DEFAULT_ARCHIVE_SUBDIR DEFAULT_ARCHIVE_SUBDIR
DEFAULT_SYS_DIR
DEBUG DEBUG
COPTIMISE_FLAG COPTIMISE_FLAG
CONFDIR CONFDIR
@ -870,7 +873,10 @@ with_cluster
with_snapshots with_snapshots
with_mirrors with_mirrors
with_raid with_raid
with_default_mirror_segtype
with_default_raid10r_segtype
with_replicators with_replicators
with_default_sparse_segtype
with_thin with_thin
with_thin_check with_thin_check
with_thin_dump with_thin_dump
@ -1638,52 +1644,53 @@ Optional Features:
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-user=USER set the owner of installed files [[USER=]] --with-user=USER set the owner of installed files [USER=]
--with-group=GROUP set the group owner of installed files [[GROUP=]] --with-group=GROUP set the group owner of installed files [GROUP=]
--with-device-uid=UID set the owner used for new device nodes [[UID=0]] --with-device-uid=UID set the owner used for new device nodes [UID=0]
--with-device-gid=GID set the group used for new device nodes [[GID=0]] --with-device-gid=GID set the group used for new device nodes [GID=0]
--with-device-mode=MODE set the mode used for new device nodes [[MODE=0600]] --with-device-mode=MODE set the mode used for new device nodes [MODE=0600]
--with-device-nodes-on=ON --with-device-nodes-on=ON
create nodes on resume or create [[ON=resume]] create nodes on resume or create [ON=resume]
--with-default-name-mangling=MANGLING --with-default-name-mangling=MANGLING
default name mangling: auto/none/hex default name mangling: auto/none/hex [auto]
[[MANGLING=auto]]
--with-lvm1=TYPE LVM1 metadata support: internal/shared/none --with-lvm1=TYPE LVM1 metadata support: internal/shared/none
[[TYPE=internal]] [internal]
--with-pool=TYPE GFS pool read-only support: internal/shared/none --with-pool=TYPE GFS pool read-only support: internal/shared/none
[[TYPE=internal]] [internal]
--with-cluster=TYPE cluster LVM locking support: internal/shared/none --with-cluster=TYPE cluster LVM locking support: internal/shared/none
[[TYPE=internal]] [internal]
--with-snapshots=TYPE snapshot support: internal/shared/none --with-snapshots=TYPE snapshot support: internal/shared/none [internal]
[[TYPE=internal]] --with-mirrors=TYPE mirror support: internal/shared/none [internal]
--with-mirrors=TYPE mirror support: internal/shared/none --with-raid=TYPE raid support: internal/shared/none [internal]
[[TYPE=internal]] --with-default-mirror-segtype=TYPE
--with-raid=TYPE raid support: internal/shared/none [[TYPE=internal]] default mirror segtype: raid1/mirror [raid1]
--with-replicators=TYPE replicator support: internal/shared/none --with-default-raid10-segtype=TYPE
[[TYPE=none]] default mirror segtype: raid10/mirror [raid10]
--with-replicators=TYPE replicator support: internal/shared/none [none]
--with-default-sparse-segtype=TYPE
default sparse segtype: thin/snapshot [thin]
--with-thin=TYPE thin provisioning support: internal/shared/none --with-thin=TYPE thin provisioning support: internal/shared/none
[[TYPE=internal]] [internal]
--with-thin-check=PATH thin_check tool: [[autodetect]] --with-thin-check=PATH thin_check tool: [autodetect]
--with-thin-dump=PATH thin_dump tool: [[autodetect]] --with-thin-dump=PATH thin_dump tool: [autodetect]
--with-thin-repair=PATH thin_repair tool: [[autodetect]] --with-thin-repair=PATH thin_repair tool: [autodetect]
--with-thin-restore=PATH --with-thin-restore=PATH
thin_restore tool: [[autodetect]] thin_restore tool: [autodetect]
--with-cache=TYPE cache support: internal/shared/none --with-cache=TYPE cache support: internal/shared/none [internal]
[[TYPE=internal]] --with-cache-check=PATH cache_check tool: [autodetect]
--with-cache-check=PATH cache_check tool: [[autodetect]] --with-cache-dump=PATH cache_dump tool: [autodetect]
--with-cache-dump=PATH cache_dump tool: [[autodetect]]
--with-cache-repair=PATH --with-cache-repair=PATH
cache_repair tool: [[autodetect]] cache_repair tool: [autodetect]
--with-cache-restore=PATH --with-cache-restore=PATH
cache_restore tool: [[autodetect]] cache_restore tool: [autodetect]
--with-ocfdir=DIR install OCF files in DIR --with-ocfdir=DIR install OCF files in
[[PREFIX/lib/ocf/resource.d/lvm2]] [PREFIX/lib/ocf/resource.d/lvm2]
--with-default-pid-dir=PID_DIR --with-default-pid-dir=PID_DIR
Default directory to keep PID files in. [[/var/run]] Default directory to keep PID files in. [/var/run]
--with-default-dm-run-dir=DM_RUN_DIR --with-default-dm-run-dir=DM_RUN_DIR
Default DM run directory. [[/var/run]] Default DM run directory. [/var/run]
--with-default-run-dir=RUN_DIR --with-default-run-dir=RUN_DIR
Default LVM run directory. [[/var/run/lvm]] Default LVM run directory. [/var/run/lvm]
--with-clvmd=TYPE build cluster LVM Daemon --with-clvmd=TYPE build cluster LVM Daemon
The following cluster manager combinations are valid: The following cluster manager combinations are valid:
* cman (RHEL5 or equivalent) * cman (RHEL5 or equivalent)
@ -1691,46 +1698,46 @@ Optional Packages:
* singlenode (localhost only) * singlenode (localhost only)
* all (autodetect) * all (autodetect)
* none (disable build) * none (disable build)
[TYPE=none] [none]
--with-clvmd-pidfile=PATH --with-clvmd-pidfile=PATH
clvmd pidfile [[PID_DIR/clvmd.pid]] clvmd pidfile [PID_DIR/clvmd.pid]
--with-cmirrord-pidfile=PATH --with-cmirrord-pidfile=PATH
cmirrord pidfile [[PID_DIR/cmirrord.pid]] cmirrord pidfile [PID_DIR/cmirrord.pid]
--with-optimisation=OPT C optimisation flag [[OPT=-O2]] --with-optimisation=OPT C optimisation flag [OPT=-O2]
--with-lvmetad-pidfile=PATH --with-lvmetad-pidfile=PATH
lvmetad pidfile [[PID_DIR/lvmetad.pid]] lvmetad pidfile [PID_DIR/lvmetad.pid]
--with-localedir=DIR translation files in DIR [[PREFIX/share/locale]] --with-localedir=DIR translation files in DIR [PREFIX/share/locale]
--with-confdir=DIR configuration files in DIR [[/etc]] --with-confdir=DIR configuration files in DIR [/etc]
--with-staticdir=DIR static binaries in DIR [[EPREFIX/sbin]] --with-staticdir=DIR static binaries in DIR [EPREFIX/sbin]
--with-usrlibdir=DIR usrlib in DIR [[PREFIX/lib]] --with-usrlibdir=DIR usrlib in DIR [PREFIX/lib]
--with-usrsbindir=DIR usrsbin executables in DIR [[PREFIX/sbin]] --with-usrsbindir=DIR usrsbin executables in DIR [PREFIX/sbin]
--with-udev-prefix=UPREFIX --with-udev-prefix=UPREFIX
install udev rule files in UPREFIX [[EPREFIX]] install udev rule files in UPREFIX [EPREFIX]
--with-udevdir=DIR udev rules in DIR [[UPREFIX/lib/udev/rules.d]] --with-udevdir=DIR udev rules in DIR [UPREFIX/lib/udev/rules.d]
--with-systemdsystemunitdir=DIR --with-systemdsystemunitdir=DIR
systemd service files in DIR systemd service files in DIR
--with-tmpfilesdir=DIR install configuration files for management of --with-tmpfilesdir=DIR install configuration files for management of
volatile files and directories in DIR volatile files and directories in DIR
[[PREFIX/lib/tmpfiles.d]] [PREFIX/lib/tmpfiles.d]
--with-dmeventd-pidfile=PATH --with-dmeventd-pidfile=PATH
dmeventd pidfile [[PID_DIR/dmeventd.pid]] dmeventd pidfile [PID_DIR/dmeventd.pid]
--with-dmeventd-path=PATH --with-dmeventd-path=PATH
dmeventd path [[EPREFIX/sbin/dmeventd]] dmeventd path [EPREFIX/sbin/dmeventd]
--with-default-system-dir=DIR --with-default-system-dir=DIR
default LVM system directory [[/etc/lvm]] default LVM system directory [/etc/lvm]
--with-default-profile-subdir=SUBDIR --with-default-profile-subdir=SUBDIR
default configuration profile subdir [[profile]] default configuration profile subdir [profile]
--with-default-archive-subdir=SUBDIR --with-default-archive-subdir=SUBDIR
default metadata archive subdir [[archive]] default metadata archive subdir [archive]
--with-default-backup-subdir=SUBDIR --with-default-backup-subdir=SUBDIR
default metadata backup subdir [[backup]] default metadata backup subdir [backup]
--with-default-cache-subdir=SUBDIR --with-default-cache-subdir=SUBDIR
default metadata cache subdir [[cache]] default metadata cache subdir [cache]
--with-default-locking-dir=DIR --with-default-locking-dir=DIR
default locking directory [[/var/lock/lvm]] default locking directory [/var/lock/lvm]
--with-default-data-alignment=NUM --with-default-data-alignment=NUM
set the default data alignment in MiB [[1]] set the default data alignment in MiB [1]
--with-interface=IFACE choose kernel interface (ioctl) [[ioctl]] --with-interface=IFACE choose kernel interface (ioctl) [ioctl]
Some influential environment variables: Some influential environment variables:
CC C compiler command CC C compiler command
@ -7244,14 +7251,44 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $RAID" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RAID" >&5
$as_echo "$RAID" >&6; } $as_echo "$RAID" >&6; }
# Check whether --with-default-mirror-segtype was given.
if test "${with_default_mirror_segtype+set}" = set; then :
withval=$with_default_mirror_segtype; DEFAULT_MIRROR_SEGTYPE=$withval
else
DEFAULT_MIRROR_SEGTYPE="raid1"
fi
# Check whether --with-default-raid10r-segtype was given.
if test "${with_default_raid10r_segtype+set}" = set; then :
withval=$with_default_raid10r_segtype; DEFAULT_RAID10_SEGTYPE=$withval
else
DEFAULT_RAID10_SEGTYPE="raid10"
fi
case "$RAID" in case "$RAID" in
none|shared) ;; none) test "$DEFAULT_MIRROR_SEGTYPE" = "raid1" && DEFAULT_MIRROR_SEGTYPE="mirror"
test "$DEFAULT_RAID10_SEGTYPE" = "raid10" && DEFAULT_RAID10_SEGTYPE="mirror" ;;
shared) ;;
internal) internal)
$as_echo "#define RAID_INTERNAL 1" >>confdefs.h $as_echo "#define RAID_INTERNAL 1" >>confdefs.h
;; ;;
*) as_fn_error $? "--with-raid parameter invalid" "$LINENO" 5 ;; *) as_fn_error $? "--with-raid parameter invalid" "$LINENO" 5 ;;
esac esac
cat >>confdefs.h <<_ACEOF
#define DEFAULT_MIRROR_SEGTYPE "$DEFAULT_MIRROR_SEGTYPE"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define DEFAULT_RAID10_SEGTYPE "$DEFAULT_RAID10_SEGTYPE"
_ACEOF
################################################################################ ################################################################################
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include replicators" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include replicators" >&5
$as_echo_n "checking whether to include replicators... " >&6; } $as_echo_n "checking whether to include replicators... " >&6; }
@ -7274,6 +7311,16 @@ $as_echo "#define REPLICATOR_INTERNAL 1" >>confdefs.h
*) as_fn_error $? "--with-replicators parameter invalid ($REPLICATORS)" "$LINENO" 5 ;; *) as_fn_error $? "--with-replicators parameter invalid ($REPLICATORS)" "$LINENO" 5 ;;
esac esac
# Check whether --with-default-sparse-segtype was given.
if test "${with_default_sparse_segtype+set}" = set; then :
withval=$with_default_sparse_segtype; DEFAULT_SPARSE_SEGTYPE=$withval
else
DEFAULT_SPARSE_SEGTYPE="thin"
fi
################################################################################ ################################################################################
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include thin provisioning" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include thin provisioning" >&5
$as_echo_n "checking whether to include thin provisioning... " >&6; } $as_echo_n "checking whether to include thin provisioning... " >&6; }
@ -7322,13 +7369,20 @@ fi
$as_echo "$THIN" >&6; } $as_echo "$THIN" >&6; }
case "$THIN" in case "$THIN" in
none|shared) ;; none) test "$DEFAULT_SPARSE_SEGTYPE" = "thin" && DEFAULT_SPARSE_SEGTYPE="snapshot" ;;
shared) ;;
internal) internal)
$as_echo "#define THIN_INTERNAL 1" >>confdefs.h $as_echo "#define THIN_INTERNAL 1" >>confdefs.h
;; ;;
*) as_fn_error $? "--with-thin parameter invalid ($THIN)" "$LINENO" 5 ;; *) as_fn_error $? "--with-thin parameter invalid ($THIN)" "$LINENO" 5 ;;
esac esac
cat >>confdefs.h <<_ACEOF
#define DEFAULT_SPARSE_SEGTYPE "$DEFAULT_SPARSE_SEGTYPE"
_ACEOF
# Check whether --enable-thin_check_needs_check was given. # Check whether --enable-thin_check_needs_check was given.
if test "${enable_thin_check_needs_check+set}" = set; then : if test "${enable_thin_check_needs_check+set}" = set; then :
enableval=$enable_thin_check_needs_check; THIN_CHECK_NEEDS_CHECK=$enableval enableval=$enable_thin_check_needs_check; THIN_CHECK_NEEDS_CHECK=$enableval
@ -7786,8 +7840,6 @@ $as_echo "$as_me: WARNING: thin_restore not found in path $PATH" >&2;}
THIN_CONFIGURE_WARN=y THIN_CONFIGURE_WARN=y
} }
fi fi
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether thin_check supports the needs-check flag" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether thin_check supports the needs-check flag" >&5
$as_echo_n "checking whether thin_check supports the needs-check flag... " >&6; } $as_echo_n "checking whether thin_check supports the needs-check flag... " >&6; }
@ -7799,6 +7851,9 @@ $as_echo "#define THIN_CHECK_NEEDS_CHECK 1" >>confdefs.h
fi fi
;;
esac
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define THIN_CHECK_CMD "$THIN_CHECK_CMD" #define THIN_CHECK_CMD "$THIN_CHECK_CMD"
@ -12598,6 +12653,9 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`