diff options
author | Zdenek Kabelac <zkabelac@redhat.com> | 2015-05-18 10:36:11 +0200 |
---|---|---|
committer | Zdenek Kabelac <zkabelac@redhat.com> | 2015-05-18 12:43:25 +0200 |
commit | fe00b163d67a6ec9c113fdc9c5ed06ad1d72c6d5 (patch) | |
tree | 3235ca24c4a4e774e82fcee937322a52427dde37 /configure | |
parent | 76cc477fbabf2ee7ceea48950cd1db32eb2e5fca (diff) | |
download | lvm2-fe00b163d67a6ec9c113fdc9c5ed06ad1d72c6d5.tar.gz |
configure: move DEFS to configure.h
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 58 |
1 files changed, 39 insertions, 19 deletions
@@ -677,11 +677,9 @@ LVM_LIBAPI LVM_VERSION LVM1_FALLBACK LVM1 -LOCALEDIR LIB_SUFFIX LDDEPS JOBS -INTL_PACKAGE INTL HAVE_VALGRIND HAVE_REALTIME @@ -691,11 +689,6 @@ FSADM ELDFLAGS DM_LIB_PATCHLEVEL DM_LIB_VERSION -DM_IOCTLS -DM_DEVICE_UID -DM_DEVICE_MODE -DM_DEVICE_GID -DM_COMPAT DMEVENTD_PATH DMEVENTD DL_LIBS @@ -7363,6 +7356,11 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DM_DEVICE_UID" >&5 $as_echo "$DM_DEVICE_UID" >&6; } +cat >>confdefs.h <<_ACEOF +#define DM_DEVICE_UID $DM_DEVICE_UID +_ACEOF + + ################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking device node gid" >&5 $as_echo_n "checking device node gid... " >&6; } @@ -7378,6 +7376,11 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DM_DEVICE_GID" >&5 $as_echo "$DM_DEVICE_GID" >&6; } +cat >>confdefs.h <<_ACEOF +#define DM_DEVICE_GID $DM_DEVICE_GID +_ACEOF + + ################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking device node mode" >&5 $as_echo_n "checking device node mode... " >&6; } @@ -7393,6 +7396,11 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DM_DEVICE_MODE" >&5 $as_echo "$DM_DEVICE_MODE" >&6; } +cat >>confdefs.h <<_ACEOF +#define DM_DEVICE_MODE $DM_DEVICE_MODE +_ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking when to create device nodes" >&5 $as_echo_n "checking when to create device nodes... " >&6; } @@ -11303,8 +11311,11 @@ else fi -if test "$DM_COMPAT" = yes; then - as_fn_error $? "--enable-compat is not currently supported. +if test "$DM_COMPAT" = yes; then : + +$as_echo "#define DM_COMPAT 1" >>confdefs.h + + as_fn_error $? "--enable-compat is not currently supported. Since device-mapper version 1.02.66, only one version (4) of the device-mapper ioctl protocol is supported." "$LINENO" 5 fi @@ -11330,6 +11341,11 @@ if test "${enable_ioctl+set}" = set; then : enableval=$enable_ioctl; DM_IOCTLS=$enableval fi +if test "$DM_IOCTLS" = yes; then : + +$as_echo "#define DM_IOCTLS 1" >>confdefs.h + +fi ################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable O_DIRECT" >&5 @@ -12408,9 +12424,10 @@ else MSGFMT="$ac_cv_path_MSGFMT" fi - if [ -z "$MSGFMT" ]; then - as_fn_error $? "msgfmt not found in path $PATH" "$LINENO" 5 - fi + + if test -z "$MSGFMT"]; then : + as_fn_error $? "msgfmt not found in path $PATH" "$LINENO" 5 +fi # Check whether --with-localedir was given. @@ -12420,6 +12437,16 @@ else LOCALEDIR='${prefix}/share/locale' fi + +cat >>confdefs.h <<_ACEOF +#define INTL_PACKAGE "$INTL_PACKAGE" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define LOCALEDIR "$LOCALEDIR" +_ACEOF + fi ################################################################################ @@ -13237,13 +13264,6 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'` - - - - - - - ################################################################################ ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmetad/Makefile daemons/lvmpolld/Makefile conf/Makefile conf/example.conf conf/lvmlocal.conf conf/command_profile_template.profile conf/metadata_profile_template.profile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile lib/misc/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile lib/cache_segtype/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile python/Makefile python/setup.py scripts/blkdeactivate.sh scripts/blk_availability_init_red_hat scripts/blk_availability_systemd_red_hat.service scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/dm_event_systemd_red_hat.service scripts/dm_event_systemd_red_hat.socket scripts/lvm2_cluster_activation_red_hat.sh scripts/lvm2_cluster_activation_systemd_red_hat.service scripts/lvm2_clvmd_systemd_red_hat.service scripts/lvm2_cmirrord_systemd_red_hat.service scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmpolld_init_red_hat scripts/lvm2_lvmpolld_systemd_red_hat.service scripts/lvm2_lvmpolld_systemd_red_hat.socket scripts/lvm2_monitoring_init_red_hat scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_pvscan_systemd_red_hat@.service scripts/lvm2_tmpfiles_red_hat.conf scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" |