lvm2-commits June 2014

lvm2-commits@lists.fedorahosted.org

6 participants
145 discussions

master - tests: fix use of double apostrophes in get
by Zdenek Kabelac 05 Jun '14

05 Jun '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=21db25b3c41dec54… Commit: 21db25b3c41dec54da2a6975bf3f3f52b151f1e7 Parent: 1b59f5a99c351448c43f9d7e71ee3088bafcc6c5 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 5 13:05:36 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 5 17:49:34 2014 +0200 tests: fix use of double apostrophes in get Need to put "" around parameters. --- test/lib/get.sh | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/lib/get.sh b/test/lib/get.sh index babc4c9..b6fbf82 100644 --- a/test/lib/get.sh +++ b/test/lib/get.sh @@ -28,15 +28,18 @@ trim_() { } pv_field() { - trim_ "$(pvs --config 'log{prefix=""}' --noheadings -o $2 ${@:3} $1)" + local r=$(pvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1") + trim_ "$r" } vg_field() { - trim_ "$(vgs --config 'log{prefix=""}' --noheadings -o $2 ${@:3} $1)" + local r=$(vgs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1") + trim_ "$r" } lv_field() { - trim_ "$(lvs --config 'log{prefix=""}' --noheadings -o $2 ${@:3} $1)" + local r=$(lvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1") + trim_ "$r" } lv_devices() {

1 0

master - configure: reconfigure
by Zdenek Kabelac 05 Jun '14

05 Jun '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1b59f5a99c351448… Commit: 1b59f5a99c351448c43f9d7e71ee3088bafcc6c5 Parent: 7cead4afea91a8905ac1b250f542ad808239ba0f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 5 17:24:32 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 5 17:47:23 2014 +0200 configure: reconfigure --- configure | 1066 +++++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 749 insertions(+), 317 deletions(-) diff --git a/configure b/configure index 7738c8f..bedccca 100755 --- a/configure +++ b/configure @@ -664,6 +664,7 @@ PKGCONFIG OCFDIR OCF MIRRORS +MANGLING LVM_RELEASE_DATE LVM_RELEASE LVM_PATH @@ -4461,8 +4462,9 @@ else RANLIB="$ac_cv_prog_RANLIB" fi -# Extract the first word of "cflow", so it can be a program name with args. -set dummy cflow; ac_word=$2 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cflow", so it can be a program name with args. +set dummy ${ac_tool_prefix}cflow; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_CFLOW_CMD+:} false; then : @@ -4501,8 +4503,66 @@ $as_echo "no" >&6; } fi -# Extract the first word of "cscope", so it can be a program name with args. -set dummy cscope; ac_word=$2 +fi +if test -z "$ac_cv_path_CFLOW_CMD"; then + ac_pt_CFLOW_CMD=$CFLOW_CMD + # Extract the first word of "cflow", so it can be a program name with args. +set dummy cflow; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_CFLOW_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_CFLOW_CMD in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_CFLOW_CMD="$ac_pt_CFLOW_CMD" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_CFLOW_CMD="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_CFLOW_CMD=$ac_cv_path_ac_pt_CFLOW_CMD +if test -n "$ac_pt_CFLOW_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CFLOW_CMD" >&5 +$as_echo "$ac_pt_CFLOW_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_CFLOW_CMD" = x; then + CFLOW_CMD="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CFLOW_CMD=$ac_pt_CFLOW_CMD + fi +else + CFLOW_CMD="$ac_cv_path_CFLOW_CMD" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cscope", so it can be a program name with args. +set dummy ${ac_tool_prefix}cscope; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_CSCOPE_CMD+:} false; then : @@ -4541,6 +4601,63 @@ $as_echo "no" >&6; } fi +fi +if test -z "$ac_cv_path_CSCOPE_CMD"; then + ac_pt_CSCOPE_CMD=$CSCOPE_CMD + # Extract the first word of "cscope", so it can be a program name with args. +set dummy cscope; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_CSCOPE_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_CSCOPE_CMD in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_CSCOPE_CMD="$ac_pt_CSCOPE_CMD" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_CSCOPE_CMD="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_CSCOPE_CMD=$ac_cv_path_ac_pt_CSCOPE_CMD +if test -n "$ac_pt_CSCOPE_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CSCOPE_CMD" >&5 +$as_echo "$ac_pt_CSCOPE_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_CSCOPE_CMD" = x; then + CSCOPE_CMD="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CSCOPE_CMD=$ac_pt_CSCOPE_CMD + fi +else + CSCOPE_CMD="$ac_cv_path_CSCOPE_CMD" +fi + ################################################################################ ac_header_dirent=no @@ -6863,10 +6980,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OWNER" >&5 $as_echo "$OWNER" >&6; } - -if test x$OWNER != x; then - INSTALL="$INSTALL -o $OWNER" -fi +test -n "$OWNER" && INSTALL="$INSTALL -o $OWNER" ################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking group owner" >&5 @@ -6879,10 +6993,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GROUP" >&5 $as_echo "$GROUP" >&6; } - -if test x$GROUP != x; then - INSTALL="$INSTALL -g $GROUP" -fi +test -n "$GROUP" && INSTALL="$INSTALL -g $GROUP" ################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking device node uid" >&5 @@ -6964,7 +7075,7 @@ fi case "$MANGLING" in auto) mangling=DM_STRING_MANGLING_AUTO;; - disabled) mangling=DM_STRING_MANGLING_NONE;; + none|disabled) mangling=DM_STRING_MANGLING_NONE;; hex) mangling=DM_STRING_MANGLING_HEX;; *) as_fn_error $? "--with-default-name-mangling parameter invalid" "$LINENO" 5;; esac @@ -6989,7 +7100,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LVM1_FALLBACK" >&5 $as_echo "$LVM1_FALLBACK" >&6; } -if test x$LVM1_FALLBACK = xyes; then +if test "$LVM1_FALLBACK" = yes; then $as_echo "#define LVM1_FALLBACK 1" >>confdefs.h @@ -7006,19 +7117,17 @@ else LVM1=internal fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LVM1" >&5 $as_echo "$LVM1" >&6; } -if [ "x$LVM1" != xnone -a "x$LVM1" != xinternal -a "x$LVM1" != xshared ]; - then as_fn_error $? "--with-lvm1 parameter invalid -" "$LINENO" 5 -fi; - -if test x$LVM1 = xinternal; then - +case "$LVM1" in + none|share) ;; + internal) $as_echo "#define LVM1_INTERNAL 1" >>confdefs.h - -fi + ;; + *) as_fn_error $? "--with-lvm1 parameter invalid" "$LINENO" 5 ;; +esac ################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include support for GFS pool metadata" >&5 @@ -7034,16 +7143,13 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POOL" >&5 $as_echo "$POOL" >&6; } -if [ "x$POOL" != xnone -a "x$POOL" != xinternal -a "x$POOL" != xshared ]; - then as_fn_error $? "--with-pool parameter invalid -" "$LINENO" 5 -fi; - -if test x$POOL = xinternal; then - +case "$POOL" in + none|shared) ;; + internal) $as_echo "#define POOL_INTERNAL 1" >>confdefs.h - -fi + ;; + *) as_fn_error $? "--with-pool parameter invalid" "$LINENO" 5 +esac ################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include support for cluster locking" >&5 @@ -7057,16 +7163,13 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLUSTER" >&5 $as_echo "$CLUSTER" >&6; } -if [ "x$CLUSTER" != xnone -a "x$CLUSTER" != xinternal -a "x$CLUSTER" != xshared ]; - then as_fn_error $? "--with-cluster parameter invalid -" "$LINENO" 5 -fi; - -if test x$CLUSTER = xinternal; then - +case "$CLUSTER" in + none|shared) ;; + internal) $as_echo "#define CLUSTER_LOCKING_INTERNAL 1" >>confdefs.h - -fi + ;; + *) as_fn_error $? "--with-cluster parameter invalid" "$LINENO" 5 ;; +esac ################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include snapshots" >&5 @@ -7082,16 +7185,13 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SNAPSHOTS" >&5 $as_echo "$SNAPSHOTS" >&6; } -if [ "x$SNAPSHOTS" != xnone -a "x$SNAPSHOTS" != xinternal -a "x$SNAPSHOTS" != xshared ]; - then as_fn_error $? "--with-snapshots parameter invalid -" "$LINENO" 5 -fi; - -if test x$SNAPSHOTS = xinternal; then - +case "$SNAPSHOTS" in + none|shared) ;; + internal) $as_echo "#define SNAPSHOT_INTERNAL 1" >>confdefs.h - -fi + ;; + *) as_fn_error $? "--with-snapshots parameter invalid" "$LINENO" 5 ;; +esac ################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include mirrors" >&5 @@ -7107,16 +7207,13 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MIRRORS" >&5 $as_echo "$MIRRORS" >&6; } -if [ "x$MIRRORS" != xnone -a "x$MIRRORS" != xinternal -a "x$MIRRORS" != xshared ]; - then as_fn_error $? "--with-mirrors parameter invalid -" "$LINENO" 5 -fi; - -if test x$MIRRORS = xinternal; then - +case "$MIRRORS" in + none|shared) ;; + internal) $as_echo "#define MIRRORED_INTERNAL 1" >>confdefs.h - -fi + ;; + *) as_fn_error $? "--with-mirrors parameter invalid" "$LINENO" 5 ;; +esac ################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include raid" >&5 @@ -7132,16 +7229,13 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RAID" >&5 $as_echo "$RAID" >&6; } -if [ "x$RAID" != xnone -a "x$RAID" != xinternal -a "x$RAID" != xshared ]; - then as_fn_error $? "--with-raid parameter invalid -" "$LINENO" 5 -fi; - -if test x$RAID = xinternal; then - +case "$RAID" in + none|shared) ;; + internal) $as_echo "#define RAID_INTERNAL 1" >>confdefs.h - -fi + ;; + *) as_fn_error $? "--with-raid parameter invalid" "$LINENO" 5 ;; +esac ################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include replicators" >&5 @@ -7728,16 +7822,13 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CACHE" >&5 $as_echo "$CACHE" >&6; } -if [ "x$CACHE" != xnone -a "x$CACHE" != xinternal -a "x$CACHE" != xshared ]; - then as_fn_error $? "--with-cache parameter invalid -" "$LINENO" 5 -fi; - -if test x$CACHE = xinternal; then - +case "$CACHE" in + none|shared) ;; + internal) $as_echo "#define CACHE_INTERNAL 1" >>confdefs.h - -fi + ;; + *) as_fn_error $? "--with-cache parameter invalid" "$LINENO" 5 ;; +esac ################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable readline" >&5 @@ -7786,6 +7877,7 @@ fi ################################################################################ pkg_config_init() { + if test "$PKGCONFIG_INIT" != 1; then @@ -7979,7 +8071,8 @@ else $as_echo "yes" >&6; } fi - PKGCONFIG_INIT=1 + PKGCONFIG_INIT=1 + fi } ################################################################################ @@ -8039,19 +8132,13 @@ else CLVMD=none fi -if test x$CLVMD = xyes; then - CLVMD=all -fi +test "$CLVMD" = yes && CLVMD=all { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLVMD" >&5 $as_echo "$CLVMD" >&6; } -if test x$CLVMD != xnone && test x$CLUSTER = xnone; then - CLUSTER=internal -fi +test "$CLVMD" != none -a "$CLUSTER" = none && CLUSTER=internal -if test x$CLVMD != xnone && test x$PKGCONFIG_INIT != x1; then - pkg_config_init -fi +test "$CLVMD" != none && pkg_config_init CLVMD_CMANAGERS="" CLVMD_NEEDS_QDISKD=no @@ -8072,9 +8159,7 @@ if [ `expr x"$CLVMD" : '.*openais.*'` != 0 ]; then BUILDOPENAIS=yes CLVMD_CMANAGERS="$CLVMD_CMANAGERS openais" fi -if test x$CLVMD_NEEDS_QDISKD != xno; then - CLVMD_CMANAGERS="$CLVMD_CMANAGERS qdiskd" -fi +test "$CLVMD_NEEDS_QDISKD" != no && CLVMD_CMANAGERS="$CLVMD_CMANAGERS qdiskd" soft_bailout() { NOTFOUND=1 @@ -8084,7 +8169,7 @@ hard_bailout() { as_fn_error $? "bailing out" "$LINENO" 5 } -if test x$CLVMD = xall; then +if test "$CLVMD" = all; then bailout=soft_bailout BUILDCMAN=yes BUILDCOROSYNC=yes @@ -8151,7 +8236,7 @@ fi LIBS=$ac_check_lib_save_LIBS } -if test x$BUILDCMAN = xyes; then +if test "$BUILDCMAN" = yes; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CMAN" >&5 @@ -8269,8 +8354,7 @@ fi CHECKDLM=yes fi -if test x$BUILDCOROSYNC = xyes || \ - test x$BUILDOPENAIS = xyes; then +if test "$BUILDCOROSYNC" = yes -o "$BUILDOPENAIS" = yes; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for COROSYNC" >&5 @@ -8346,7 +8430,7 @@ fi CHECKCMAP=yes fi -if test x$BUILDCOROSYNC = xyes; then +if test "$BUILDCOROSYNC" = yes; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for QUORUM" >&5 @@ -8422,7 +8506,7 @@ fi CHECKDLM=yes fi -if test x$BUILDOPENAIS = xyes; then +if test "$BUILDOPENAIS" = yes; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SALCK" >&5 @@ -8499,7 +8583,7 @@ fi -if test x$CHECKCONFDB = xyes; then +if test "$CHECKCONFDB" = yes; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CONFDB" >&5 @@ -8587,8 +8671,7 @@ fi done - if test x$HAVE_CONFDB != xyes && \ - test x$HAVE_CONFDB_H = xyes; then + if test "$HAVE_CONFDB" != yes -a "$HAVE_CONFDB_H" = yes; then check_lib_no_libs confdb confdb_initialize { $as_echo "$as_me:${as_lineno-$LINENO}: result: no pkg for confdb, using -lconfdb" >&5 $as_echo "no pkg for confdb, using -lconfdb" >&6; } @@ -8598,7 +8681,7 @@ $as_echo "no pkg for confdb, using -lconfdb" >&6; } fi -if test x$CHECKCMAP = xyes; then +if test "$CHECKCMAP" = yes; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CMAP" >&5 @@ -8686,8 +8769,7 @@ fi done - if test x$HAVE_CMAP != xyes && \ - test x$HAVE_CMAP_H = xyes; then + if test "$HAVE_CMAP" != yes -a "$HAVE_CMAP_H" = yes; then check_lib_no_libs cmap cmap_initialize { $as_echo "$as_me:${as_lineno-$LINENO}: result: no pkg for cmap, using -lcmap" >&5 $as_echo "no pkg for cmap, using -lcmap" >&6; } @@ -8696,15 +8778,12 @@ $as_echo "no pkg for cmap, using -lcmap" >&6; } fi fi -if test x$BUILDCOROSYNC = xyes; then - if test x$HAVE_CMAP != xyes && \ - test x$HAVE_CONFDB != xyes && \ - test x$CLVMD != xall; then - as_fn_error $? "bailing out... cmap (corosync >= 2.0) or confdb (corosync < 2.0) library is required" "$LINENO" 5 - fi +if test "$BUILDCOROSYNC" = yes -a \ + "$HAVE_CMAP" != yes -a "$HAVE_CONFDB" != yes -a "$CLVMD" != all; then + as_fn_error $? "bailing out... cmap (corosync >= 2.0) or confdb (corosync < 2.0) library is required" "$LINENO" 5 fi -if test x$CHECKCPG = xyes; then +if test "$CHECKCPG" = yes; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPG" >&5 @@ -8778,7 +8857,7 @@ $as_echo "yes" >&6; } fi fi -if test x$CHECKDLM = xyes; then +if test "$CHECKDLM" = yes; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DLM" >&5 @@ -8894,54 +8973,48 @@ $as_echo "yes" >&6; } fi fi -if test x$CLVMD = xall; then +if test "$CLVMD" = all; then CLVMD=none CLVMD_CMANAGERS="" CLVMD_NEEDS_QDISKD=no - if test x$HAVE_CMAN = xyes && \ - test x$HAVE_DLM = xyes; then + if test "$HAVE_CMAN" = yes -a \ + "$HAVE_DLM" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling clvmd cman cluster manager" >&5 $as_echo "Enabling clvmd cman cluster manager" >&6; } CLVMD="$CLVMD,cman" CLVMD_CMANAGERS="$CLVMD_CMANAGERS cman" CLVMD_NEEDS_QDISKD=yes fi - if test x$HAVE_COROSYNC = xyes && \ - test x$HAVE_QUORUM = xyes && \ - test x$HAVE_CPG = xyes && \ - test x$HAVE_DLM = xyes; then - if test x$HAVE_CONFDB = xyes || test x$HAVE_CMAP = xyes; then + if test "$HAVE_COROSYNC" = yes -a \ + "$HAVE_QUORUM" = yes -a \ + "$HAVE_CPG" = yes -a \ + "$HAVE_DLM" = yes; then + if test "$HAVE_CONFDB" = yes -o "$HAVE_CMAP" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling clvmd corosync cluster manager" >&5 $as_echo "Enabling clvmd corosync cluster manager" >&6; } CLVMD="$CLVMD,corosync" CLVMD_CMANAGERS="$CLVMD_CMANAGERS corosync" fi fi - if test x$HAVE_COROSYNC = xyes && \ - test x$HAVE_CPG = xyes && \ - test x$HAVE_SALCK = xyes; then + if test "$HAVE_COROSYNC" = yes -a \ + "$HAVE_CPG" = yes -a \ + "$HAVE_SALCK" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling clvmd openais cluster manager" >&5 $as_echo "Enabling clvmd openais cluster manager" >&6; } CLVMD="$CLVMD,openais" CLVMD_CMANAGERS="$CLVMD_CMANAGERS openais" fi - if test x$CLVMD_NEEDS_QDISKD != xno; then - CLVMD_CMANAGERS="$CLVMD_CMANAGERS qdiskd" - fi - if test x$CLVMD = xnone; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling clvmd build. No cluster manager detected." >&5 + test "$CLVMD_NEEDS_QDISKD" != no && CLVMD_CMANAGERS="$CLVMD_CMANAGERS qdiskd" + test "$CLVMD" = none && { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling clvmd build. No cluster manager detected." >&5 $as_echo "Disabling clvmd build. No cluster manager detected." >&6; } - fi fi if [ `expr x"$CLVMD" : '.*corosync.*'` != 0 ]; then - if test x$HAVE_CMAP = xyes; then - CLVMD_CMANAGERS="$CLVMD_CMANAGERS dlm" - fi + test "$HAVE_CMAP" = yes && CLVMD_CMANAGERS="$CLVMD_CMANAGERS dlm" fi ################################################################################ -if test "x$CLVMD" != xnone; then +if test "$CLVMD" != none; then # Check whether --with-clvmd-pidfile was given. if test "${with_clvmd_pidfile+set}" = set; then : @@ -8973,7 +9046,7 @@ $as_echo "$CMIRRORD" >&6; } BUILD_CMIRRORD=$CMIRRORD ################################################################################ -if test "x$BUILD_CMIRRORD" = xyes; then +if test "$BUILD_CMIRRORD" = yes; then # Check whether --with-cmirrord-pidfile was given. if test "${with_cmirrord_pidfile+set}" = set; then : @@ -8990,10 +9063,8 @@ _ACEOF fi ################################################################################ -if [ "x$BUILD_CMIRRORD" = xyes ]; then - if test x$PKGCONFIG_INIT != x1; then - pkg_config_init - fi +if [ "$BUILD_CMIRRORD" = yes ]; then + pkg_config_init $as_echo "#define CMIRROR_HAS_CHECKPOINT 1" >>confdefs.h @@ -9078,8 +9149,7 @@ $as_echo "yes" >&6; } HAVE_SACKPT=yes fi - if test x$HAVE_CPG != xyes; then - + test "$HAVE_CPG" != yes && pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPG" >&5 $as_echo_n "checking for CPG... " >&6; } @@ -9170,7 +9240,6 @@ else $as_echo "yes" >&6; } fi - fi fi ################################################################################ @@ -9186,7 +9255,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEBUG" >&5 $as_echo "$DEBUG" >&6; } -if test x$DEBUG = xyes; then +if test "$DEBUG" = yes; then COPTIMISE_FLAG= else CSCOPE_CMD= @@ -9294,10 +9363,11 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROFILING" >&5 $as_echo "$PROFILING" >&6; } -if test "x$PROFILING" = xyes; then +if test "$PROFILING" = yes; then COPTIMISE_FLAG="$COPTIMISE_FLAG -fprofile-arcs -ftest-coverage" - # Extract the first word of "lcov", so it can be a program name with args. -set dummy lcov; ac_word=$2 + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lcov", so it can be a program name with args. +set dummy ${ac_tool_prefix}lcov; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_LCOV+:} false; then : @@ -9336,8 +9406,66 @@ $as_echo "no" >&6; } fi - # Extract the first word of "genhtml", so it can be a program name with args. -set dummy genhtml; ac_word=$2 +fi +if test -z "$ac_cv_path_LCOV"; then + ac_pt_LCOV=$LCOV + # Extract the first word of "lcov", so it can be a program name with args. +set dummy lcov; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_LCOV+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_LCOV in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_LCOV="$ac_pt_LCOV" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_LCOV="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_LCOV=$ac_cv_path_ac_pt_LCOV +if test -n "$ac_pt_LCOV"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LCOV" >&5 +$as_echo "$ac_pt_LCOV" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_LCOV" = x; then + LCOV="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + LCOV=$ac_pt_LCOV + fi +else + LCOV="$ac_cv_path_LCOV" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}genhtml", so it can be a program name with args. +set dummy ${ac_tool_prefix}genhtml; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_GENHTML+:} false; then : @@ -9376,19 +9504,19 @@ $as_echo "no" >&6; } fi - if test -z "$LCOV" -o -z "$GENHTML"; then - as_fn_error $? "lcov and genhtml are required for profiling" "$LINENO" 5 - fi - # Extract the first word of "genpng", so it can be a program name with args. -set dummy genpng; ac_word=$2 +fi +if test -z "$ac_cv_path_GENHTML"; then + ac_pt_GENHTML=$GENHTML + # Extract the first word of "genhtml", so it can be a program name with args. +set dummy genhtml; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GENPNG+:} false; then : +if ${ac_cv_path_ac_pt_GENHTML+:} false; then : $as_echo_n "(cached) " >&6 else - case $GENPNG in + case $ac_pt_GENHTML in [\\/]* | ?:[\\/]*) - ac_cv_path_GENPNG="$GENPNG" # Let the user override the test with a path. + ac_cv_path_ac_pt_GENHTML="$ac_pt_GENHTML" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -9398,7 +9526,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GENPNG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_ac_pt_GENHTML="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -9409,37 +9537,150 @@ IFS=$as_save_IFS ;; esac fi -GENPNG=$ac_cv_path_GENPNG -if test -n "$GENPNG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENPNG" >&5 -$as_echo "$GENPNG" >&6; } +ac_pt_GENHTML=$ac_cv_path_ac_pt_GENHTML +if test -n "$ac_pt_GENHTML"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_GENHTML" >&5 +$as_echo "$ac_pt_GENHTML" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - - if test -n "$GENPNG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $GENPNG has all required modules" >&5 -$as_echo_n "checking whether $GENPNG has all required modules... " >&6; } - if $GENPNG --help > /dev/null 2>&1 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - GENHTML="$GENHTML --frames" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 -$as_echo "not supported" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GD.pm perl module is not installed" >&5 -$as_echo "$as_me: WARNING: GD.pm perl module is not installed" >&2;} - GENPNG= - fi + if test "x$ac_pt_GENHTML" = x; then + GENHTML="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + GENHTML=$ac_pt_GENHTML fi +else + GENHTML="$ac_cv_path_GENHTML" fi -################################################################################ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable unit testing" >&5 -$as_echo_n "checking whether to enable unit testing... " >&6; } -# Check whether --enable-testing was given. + test -z "$LCOV" -o -z "$GENHTML" && as_fn_error $? "lcov and genhtml are required for profiling" "$LINENO" 5 + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}genpng", so it can be a program name with args. +set dummy ${ac_tool_prefix}genpng; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GENPNG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GENPNG in + [\\/]* | ?:[\\/]*) + ac_cv_path_GENPNG="$GENPNG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GENPNG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GENPNG=$ac_cv_path_GENPNG +if test -n "$GENPNG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENPNG" >&5 +$as_echo "$GENPNG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_GENPNG"; then + ac_pt_GENPNG=$GENPNG + # Extract the first word of "genpng", so it can be a program name with args. +set dummy genpng; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_GENPNG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_GENPNG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_GENPNG="$ac_pt_GENPNG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_GENPNG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_GENPNG=$ac_cv_path_ac_pt_GENPNG +if test -n "$ac_pt_GENPNG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_GENPNG" >&5 +$as_echo "$ac_pt_GENPNG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_GENPNG" = x; then + GENPNG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + GENPNG=$ac_pt_GENPNG + fi +else + GENPNG="$ac_cv_path_GENPNG" +fi + + if test -n "$GENPNG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $GENPNG has all required modules" >&5 +$as_echo_n "checking whether $GENPNG has all required modules... " >&6; } + if "$GENPNG" --help > /dev/null 2>&1 ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + GENHTML="$GENHTML --frames" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 +$as_echo "not supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GD.pm perl module is not installed" >&5 +$as_echo "$as_me: WARNING: GD.pm perl module is not installed" >&2;} + GENPNG= + fi + fi +fi + +################################################################################ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable unit testing" >&5 +$as_echo_n "checking whether to enable unit testing... " >&6; } +# Check whether --enable-testing was given. if test "${enable_testing+set}" = set; then : enableval=$enable_testing; TESTING=$enableval else @@ -9450,9 +9691,7 @@ fi $as_echo "$TESTING" >&6; } if test "$TESTING" = yes; then - if test x$PKGCONFIG_INIT != x1; then - pkg_config_init - fi + pkg_config_init pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUNIT" >&5 @@ -9560,6 +9799,7 @@ fi $as_echo "$VALGRIND_POOL" >&6; } if test "$VALGRIND_POOL" = yes; then + pkg_config_init pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALGRIND" >&5 @@ -9649,7 +9889,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEVMAPPER" >&5 $as_echo "$DEVMAPPER" >&6; } -if test x$DEVMAPPER = xyes; then +if test "$DEVMAPPER" = yes; then $as_echo "#define DEVMAPPER_SUPPORT 1" >>confdefs.h @@ -9668,7 +9908,7 @@ $as_echo "$LVMETAD" >&6; } BUILD_LVMETAD=$LVMETAD -if test x$BUILD_LVMETAD = xyes; then +if test "$BUILD_LVMETAD" = yes; then $as_echo "#define LVMETAD_SUPPORT 1" >>confdefs.h @@ -9701,10 +9941,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BLKID_WIPING" >&5 $as_echo "$BLKID_WIPING" >&6; } -if test x$BLKID_WIPING != xno; then - if test x$PKGCONFIG_INIT != x1; then - pkg_config_init - fi +if test "$BLKID_WIPING" != no; then + pkg_config_init pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLKID" >&5 @@ -9764,31 +10002,27 @@ fi # Put the nasty error message in config.log where it belongs echo "$BLKID_PKG_ERRORS" >&5 - if test x$BLKID_WIPING = xmaybe; then - BLKID_WIPING=no - else - as_fn_error $? "bailing out... blkid library >= 2.24 is required" "$LINENO" 5 - fi - + if test "$BLKID_WIPING" = maybe; then + BLKID_WIPING=no + else + as_fn_error $? "bailing out... blkid library >= 2.24 is required" "$LINENO" 5 + fi elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - if test x$BLKID_WIPING = xmaybe; then - BLKID_WIPING=no - else - as_fn_error $? "bailing out... blkid library >= 2.24 is required" "$LINENO" 5 - fi - + if test "$BLKID_WIPING" = maybe; then + BLKID_WIPING=no + else + as_fn_error $? "bailing out... blkid library >= 2.24 is required" "$LINENO" 5 + fi else BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS BLKID_LIBS=$pkg_cv_BLKID_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - if test x$BLKID_WIPING = xmaybe; then - BLKID_WIPING=yes - fi + test "$BLKID_WIPING" = maybe && BLKID_WIPING=yes fi - if test x$BLKID_WIPING = xyes; then + if test "$BLKID_WIPING" = yes; then BLKID_PC="blkid" $as_echo "#define BLKID_WIPING_SUPPORT 1" >>confdefs.h @@ -9822,10 +10056,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UDEV_SYNC" >&5 $as_echo "$UDEV_SYNC" >&6; } -if test x$UDEV_SYNC = xyes; then - if test x$PKGCONFIG_INIT != x1; then - pkg_config_init - fi +if test "$UDEV_SYNC" = yes; then + pkg_config_init pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5 @@ -9946,16 +10178,18 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UDEV_RULE_EXEC_DETECTION" >&5 $as_echo "$UDEV_RULE_EXEC_DETECTION" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether udev supports built-in blkid" >&5 +if test "$UDEV_RULE" != no ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether udev supports built-in blkid" >&5 $as_echo_n "checking whether udev supports built-in blkid... " >&6; } -test x$PKGCONFIG_INIT != x1 && pkg_config_init -if $($PKG_CONFIG --atleast-version=176 libudev); then - UDEV_HAS_BUILTIN_BLKID=yes -else - UDEV_HAS_BUILTIN_BLKID=no -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UDEV_HAS_BUILTIN_BLKID" >&5 + pkg_config_init + if $("$PKG_CONFIG" --atleast-version=176 libudev); then + UDEV_HAS_BUILTIN_BLKID=yes + else + UDEV_HAS_BUILTIN_BLKID=no + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UDEV_HAS_BUILTIN_BLKID" >&5 $as_echo "$UDEV_HAS_BUILTIN_BLKID" >&6; } +fi ################################################################################ # Check whether --enable-compat was given. @@ -9966,11 +10200,10 @@ else fi -if test x$DM_COMPAT = xyes; then +if test "$DM_COMPAT" = yes; then 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 +ioctl protocol is supported." "$LINENO" 5 fi ################################################################################ @@ -9982,7 +10215,7 @@ else fi -if test x$UNITS_COMPAT = xyes; then +if test "$UNITS_COMPAT" = yes; then $as_echo "#define DEFAULT_SI_UNIT_CONSISTENCY 0" >>confdefs.h @@ -10006,7 +10239,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ODIRECT" >&5 $as_echo "$ODIRECT" >&6; } -if test x$ODIRECT = xyes; then +if test "$ODIRECT" = yes; then $as_echo "#define O_DIRECT_SUPPORT 1" >>confdefs.h @@ -10025,7 +10258,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $APPLIB" >&5 $as_echo "$APPLIB" >&6; } -test x$APPLIB = xyes \ +test "$APPLIB" = yes \ && LVM2APP_LIB=-llvm2app \ || LVM2APP_LIB= @@ -10042,7 +10275,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CMDLIB" >&5 $as_echo "$CMDLIB" >&6; } -test x$CMDLIB = xyes \ +test "$CMDLIB" = yes \ && LVM2CMD_LIB=-llvm2cmd \ || LVM2CMD_LIB= @@ -10059,14 +10292,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_BINDINGS" >&5 $as_echo "$PYTHON_BINDINGS" >&6; } -if test x$PYTHON_BINDINGS = xyes; then - if test x$APPLIB != xyes; then - as_fn_error $? "--enable-python_bindings requires --enable-applib - " "$LINENO" 5 - fi +if test "$PYTHON_BINDINGS" = yes; then + test "$APPLIB" != yes && as_fn_error $? "--enable-python_bindings requires --enable-applib" "$LINENO" 5 - # Extract the first word of "python", so it can be a program name with args. -set dummy python; ac_word=$2 + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}python", so it can be a program name with args. +set dummy ${ac_tool_prefix}python; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_PYTHON+:} false; then : @@ -10092,7 +10323,6 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="notfound" ;; esac fi @@ -10106,13 +10336,68 @@ $as_echo "no" >&6; } fi - if test x$PYTHON == xnotfound; then - as_fn_error $? "python is required for --enable-python_bindings but cannot be found - " "$LINENO" 5 - fi +fi +if test -z "$ac_cv_path_PYTHON"; then + ac_pt_PYTHON=$PYTHON + # Extract the first word of "python", so it can be a program name with args. +set dummy python; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PYTHON in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PYTHON="$ac_pt_PYTHON" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PYTHON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - # Extract the first word of "python-config", so it can be a program name with args. -set dummy python-config; ac_word=$2 + ;; +esac +fi +ac_pt_PYTHON=$ac_cv_path_ac_pt_PYTHON +if test -n "$ac_pt_PYTHON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PYTHON" >&5 +$as_echo "$ac_pt_PYTHON" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PYTHON" = x; then + PYTHON="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PYTHON=$ac_pt_PYTHON + fi +else + PYTHON="$ac_cv_path_PYTHON" +fi + + test -z "$PYTHON" && as_fn_error $? "python is required for --enable-python_bindings but cannot be found" "$LINENO" 5 + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}python-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}python-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_PYTHON_CONFIG+:} false; then : @@ -10138,7 +10423,6 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_PYTHON_CONFIG" && ac_cv_path_PYTHON_CONFIG="notfound" ;; esac fi @@ -10152,14 +10436,67 @@ $as_echo "no" >&6; } fi - if test x$PYTHON_CONFIG == xnotfound; then - as_fn_error $? "python headers are required for --enable-python_bindings but cannot be found - " "$LINENO" 5 - fi +fi +if test -z "$ac_cv_path_PYTHON_CONFIG"; then + ac_pt_PYTHON_CONFIG=$PYTHON_CONFIG + # Extract the first word of "python-config", so it can be a program name with args. +set dummy python-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PYTHON_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PYTHON_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PYTHON_CONFIG="$ac_pt_PYTHON_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PYTHON_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - PYTHON_INCDIRS=`$PYTHON_CONFIG --includes` - PYTHON_LIBDIRS=`$PYTHON_CONFIG --libs` + ;; +esac +fi +ac_pt_PYTHON_CONFIG=$ac_cv_path_ac_pt_PYTHON_CONFIG +if test -n "$ac_pt_PYTHON_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PYTHON_CONFIG" >&5 +$as_echo "$ac_pt_PYTHON_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_pt_PYTHON_CONFIG" = x; then + PYTHON_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PYTHON_CONFIG=$ac_pt_PYTHON_CONFIG + fi +else + PYTHON_CONFIG="$ac_cv_path_PYTHON_CONFIG" +fi + + test -z "$PYTHON_CONFIG" && as_fn_error $? "python headers are required for --enable-python_bindings but cannot be found" "$LINENO" 5 + + PYTHON_INCDIRS=`"$PYTHON_CONFIG" --includes` + PYTHON_LIBDIRS=`"$PYTHON_CONFIG" --libs` fi ################################################################################ @@ -10215,18 +10552,14 @@ $as_echo "$DMEVENTD" >&6; } BUILD_DMEVENTD=$DMEVENTD -if test x$DMEVENTD = xyes; then - if test x$MIRRORS != xinternal; then - as_fn_error $? "--enable-dmeventd currently requires --with-mirrors=internal - " "$LINENO" 5 +if test "$DMEVENTD" = yes; then + if test "$MIRRORS" != internal; then + as_fn_error $? "--enable-dmeventd currently requires --with-mirrors=internal" "$LINENO" 5 fi - if test x$CMDLIB = xno; then - as_fn_error $? "--enable-dmeventd requires --enable-cmdlib to be used as well - " "$LINENO" 5 + if test "$CMDLIB" = no; then + as_fn_error $? "--enable-dmeventd requires --enable-cmdlib to be used as well" "$LINENO" 5 fi -fi -if test x$DMEVENTD = xyes; then $as_echo "#define DMEVENTD 1" >>confdefs.h @@ -10323,9 +10656,7 @@ fi ################################################################################ -if [ "x$exec_prefix" = xNONE -a "x$prefix" = xNONE ]; - then exec_prefix=""; -fi; +test "$exec_prefix" = NONE -a "$prefix" = NONE && exec_prefix="" ################################################################################ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 @@ -10366,26 +10697,22 @@ fi $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - $as_echo "#define HAVE_LIBDL 1" >>confdefs.h - DL_LIBS="-ldl" - HAVE_LIBDL=yes + DL_LIBS="-ldl" + HAVE_LIBDL=yes else - - DL_LIBS= - HAVE_LIBDL=no + DL_LIBS= + HAVE_LIBDL=no fi ################################################################################ -if [ $ "x$LVM1" = xshared -o "x$POOL" = xshared -o "x$CLUSTER" = xshared \ - -o "x$SNAPSHOTS" = xshared -o "x$MIRRORS" = xshared \ - -o "x$RAID" = xshared \ - -o "x$CACHE" = xshared \ - $ -a "x$STATIC_LINK" = xyes ]; - then as_fn_error $? "Features cannot be 'shared' when building statically -" "$LINENO" 5 +if [ $ "$LVM1" = shared -o "$POOL" = shared -o "$CLUSTER" = shared \ + -o "$SNAPSHOTS" = shared -o "$MIRRORS" = shared \ + -o "$RAID" = shared -o "$CACHE" = shared \ + $ -a "$STATIC_LINK" = yes ]; then + as_fn_error $? "Features cannot be 'shared' when building statically" "$LINENO" 5 fi ################################################################################ @@ -10444,7 +10771,7 @@ fi $as_echo "$SELINUX" >&6; } ################################################################################ -if test x$SELINUX = xyes; then +if test "$SELINUX" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sepol_check_context in -lsepol" >&5 $as_echo_n "checking for sepol_check_context in -lsepol... " >&6; } if ${ac_cv_lib_sepol_sepol_check_context+:} false; then : @@ -10572,7 +10899,7 @@ fi fi ################################################################################ -if test x$REALTIME = xyes; then +if test "$REALTIME" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 $as_echo_n "checking for clock_gettime in -lrt... " >&6; } if ${ac_cv_lib_rt_clock_gettime+:} false; then : @@ -10616,7 +10943,7 @@ else fi - if test x$HAVE_REALTIME = xyes; then + if test "$HAVE_REALTIME" = yes; then $as_echo "#define HAVE_REALTIME 1" >>confdefs.h @@ -10843,11 +11170,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTL" >&5 $as_echo "$INTL" >&6; } -if test x$INTL = xyes; then +if test "$INTL" = yes; then # FIXME - Move this - can be device-mapper too INTL_PACKAGE="lvm2" - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}msgfmt", so it can be a program name with args. +set dummy ${ac_tool_prefix}msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_MSGFMT+:} false; then : @@ -10886,10 +11214,66 @@ $as_echo "no" >&6; } fi - if [ "x$MSGFMT" == x ]; - then as_fn_error $? "msgfmt not found in path $PATH - " "$LINENO" 5 - fi; +fi +if test -z "$ac_cv_path_MSGFMT"; then + ac_pt_MSGFMT=$MSGFMT + # Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_MSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_MSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_MSGFMT="$ac_pt_MSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_MSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_MSGFMT=$ac_cv_path_ac_pt_MSGFMT +if test -n "$ac_pt_MSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_MSGFMT" >&5 +$as_echo "$ac_pt_MSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_MSGFMT" = x; then + MSGFMT="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MSGFMT=$ac_pt_MSGFMT + fi +else + MSGFMT="$ac_cv_path_MSGFMT" +fi + + if [ -z "$MSGFMT" ]; then + as_fn_error $? "msgfmt not found in path $PATH" "$LINENO" 5 + fi # Check whether --with-localedir was given. @@ -10963,23 +11347,17 @@ fi if test "${with_systemdsystemunitdir+set}" = set; then : withval=$with_systemdsystemunitdir; systemdsystemunitdir=$withval else - test x$PKGCONFIG_INIT != x1 && pkg_config_init - pkg_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + pkg_config_init + pkg_systemdsystemunitdir=$("$PKG_CONFIG" --variable=systemdsystemunitdir systemd) fi -if test -n "$pkg_systemdsystemunitdir"; then - systemdsystemunitdir=$pkg_systemdsystemunitdir; -fi +test -n "$pkg_systemdsystemunitdir" && systemdsystemunitdir=$pkg_systemdsystemunitdir +test -z "$systemdsystemunitdir" && systemdsystemunitdir='${exec_prefix}/lib/systemd/system'; -if test -z "$systemdsystemunitdir"; then - systemdsystemunitdir='${exec_prefix}/lib/systemd/system'; -fi +systemdutildir=$("$PKG_CONFIG" --variable=systemdutildir systemd) +test -z "$systemdutildir" && systemdutildir='${exec_prefix}/lib/systemd'; -systemdutildir=$($PKG_CONFIG --variable=systemdutildir systemd) -if test -z "$systemdutildir"; then - systemdutildir='${exec_prefix}/lib/systemd'; -fi ################################################################################ # Check whether --with-tmpfilesdir was given. @@ -10990,7 +11368,7 @@ else fi ################################################################################ -if test x$READLINE = xyes; then +if test "$READLINE" = yes; then for ac_header in readline/readline.h readline/history.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -11001,14 +11379,14 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : _ACEOF else - as_fn_error $? "bailing out" "$LINENO" 5 + hard_bailout fi done fi -if test x$CLVMD != xnone; then +if test "$CLVMD" != none; then for ac_header in mntent.h netdb.h netinet/in.h pthread.h search.h sys/mount.h sys/socket.h sys/uio.h sys/un.h utmpx.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -11034,7 +11412,7 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then : _ACEOF else - as_fn_error $? "bailing out" "$LINENO" 5 + hard_bailout fi done @@ -11179,7 +11557,7 @@ rm -f conftest* fi -if test x$CLUSTER != xnone; then +if test "$CLUSTER" != none; then for ac_header in sys/socket.h sys/un.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -11190,7 +11568,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : _ACEOF else - as_fn_error $? "bailing out" "$LINENO" 5 + hard_bailout fi done @@ -11204,13 +11582,13 @@ if test "x$ac_cv_func_socket" = xyes; then : _ACEOF else - as_fn_error $? "bailing out" "$LINENO" 5 + hard_bailout fi done fi -if test x$DMEVENTD = xyes; then +if test "$DMEVENTD" = yes; then for ac_header in arpa/inet.h do : ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" @@ -11220,14 +11598,14 @@ if test "x$ac_cv_header_arpa_inet_h" = xyes; then : _ACEOF else - as_fn_error $? "bailing out" "$LINENO" 5 + hard_bailout fi done fi -if test x$HAVE_LIBDL = xyes; then +if test "$HAVE_LIBDL" = yes; then for ac_header in dlfcn.h do : ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" @@ -11237,14 +11615,14 @@ if test "x$ac_cv_header_dlfcn_h" = xyes; then : _ACEOF else - as_fn_error $? "bailing out" "$LINENO" 5 + hard_bailout fi done fi -if test x$INTL = xyes; then +if test "$INTL" = yes; then for ac_header in libintl.h do : ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" @@ -11254,14 +11632,14 @@ if test "x$ac_cv_header_libintl_h" = xyes; then : _ACEOF else - as_fn_error $? "bailing out" "$LINENO" 5 + hard_bailout fi done fi -if test x$UDEV_SYNC = xyes; then +if test "$UDEV_SYNC" = yes; then for ac_header in sys/ipc.h sys/sem.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -11272,7 +11650,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : _ACEOF else - as_fn_error $? "bailing out" "$LINENO" 5 + hard_bailout fi done @@ -11280,8 +11658,9 @@ done fi ################################################################################ -# Extract the first word of "modprobe", so it can be a program name with args. -set dummy modprobe; ac_word=$2 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}modprobe", so it can be a program name with args. +set dummy ${ac_tool_prefix}modprobe; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_MODPROBE_CMD+:} false; then : @@ -11320,8 +11699,65 @@ $as_echo "no" >&6; } fi +fi +if test -z "$ac_cv_path_MODPROBE_CMD"; then + ac_pt_MODPROBE_CMD=$MODPROBE_CMD + # Extract the first word of "modprobe", so it can be a program name with args. +set dummy modprobe; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_MODPROBE_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_MODPROBE_CMD in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_MODPROBE_CMD="$ac_pt_MODPROBE_CMD" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_MODPROBE_CMD="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_MODPROBE_CMD=$ac_cv_path_ac_pt_MODPROBE_CMD +if test -n "$ac_pt_MODPROBE_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_MODPROBE_CMD" >&5 +$as_echo "$ac_pt_MODPROBE_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_MODPROBE_CMD" = x; then + MODPROBE_CMD="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MODPROBE_CMD=$ac_pt_MODPROBE_CMD + fi +else + MODPROBE_CMD="$ac_cv_path_MODPROBE_CMD" +fi + -if test x$MODPROBE_CMD != x; then +if test -n "$MODPROBE_CMD"; then cat >>confdefs.h <<_ACEOF #define MODPROBE_CMD "$MODPROBE_CMD" @@ -11341,9 +11777,9 @@ _ACEOF if test "$CLVMD" != none; then - clvmd_prefix=$ac_default_prefix - CLVMD_PATH="$clvmd_prefix/sbin/clvmd" - test "$prefix" != NONE && clvmd_prefix=$prefix + clvmd_prefix=$ac_default_prefix + CLVMD_PATH="$clvmd_prefix/sbin/clvmd" + test "$prefix" != NONE && clvmd_prefix=$prefix cat >>confdefs.h <<_ACEOF #define CLVMD_PATH "$CLVMD_PATH" @@ -11495,10 +11931,7 @@ else interface=ioctl fi -if [ "x$interface" != xioctl ]; -then - as_fn_error $? "--with-interface=ioctl required. fs no longer supported." "$LINENO" 5 -fi +test "$interface" != ioctl && as_fn_error $? "--with-interface=ioctl required. fs no longer supported." "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interface" >&5 $as_echo "$interface" >&6; } @@ -11655,6 +12088,7 @@ 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 conf/Makefile conf/example.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_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" @@ -13019,7 +13453,5 @@ $as_echo "$as_me: WARNING: Support for thin provisioning is limited since some t test -n "$THIN_CHECK_VERSION_WARN" && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You should also install thin_check vsn 0.3.2 (or later) to use lvm2 thin provisioning" >&5 $as_echo "$as_me: WARNING: You should also install thin_check vsn 0.3.2 (or later) to use lvm2 thin provisioning" >&2;} -if test x$ODIRECT != xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: O_DIRECT disabled: low-memory pvmove may lock up" >&5 +test "$ODIRECT" != yes && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: O_DIRECT disabled: low-memory pvmove may lock up" >&5 $as_echo "$as_me: WARNING: O_DIRECT disabled: low-memory pvmove may lock up" >&2;} -fi

1 0

master - configure: cleanups
by Zdenek Kabelac 05 Jun '14

05 Jun '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7cead4afea91a890… Commit: 7cead4afea91a8905ac1b250f542ad808239ba0f Parent: b3ace4f9afaf36688820b72fdca7dcc54928151f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 5 17:28:03 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 5 17:47:23 2014 +0200 configure: cleanups Replace AC_PATH_PROG with AC_PATH_TOOL. Drop 'x' when already using "" around shell variable. Simlify some long line and ifs. Merge multiple test evaluation with '-a', '-o'. Use 'case' instead if several ifs when it's more elegant. Improve usage of pkg_config_init and add it where it's been missing. Check for UDEV_HAS_BUILTIN_BLKID and when building udev-rules. --- configure.in | 531 ++++++++++++++++++++++++---------------------------------- 1 files changed, 215 insertions(+), 316 deletions(-) diff --git a/configure.in b/configure.in index b16d34a..a1dfee5 100644 --- a/configure.in +++ b/configure.in @@ -77,8 +77,8 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_MKDIR_P AC_PROG_RANLIB -AC_PATH_PROG(CFLOW_CMD, cflow) -AC_PATH_PROG(CSCOPE_CMD, cscope) +AC_PATH_TOOL(CFLOW_CMD, cflow) +AC_PATH_TOOL(CSCOPE_CMD, cscope) ################################################################################ dnl -- Check for header files. @@ -176,10 +176,7 @@ AC_ARG_WITH(user, [set the owner of installed files [[USER=]]]), OWNER=$withval) AC_MSG_RESULT($OWNER) - -if test x$OWNER != x; then - INSTALL="$INSTALL -o $OWNER" -fi +test -n "$OWNER" && INSTALL="$INSTALL -o $OWNER" ################################################################################ dnl -- Setup the group ownership of the files @@ -189,10 +186,7 @@ AC_ARG_WITH(group, [set the group owner of installed files [[GROUP=]]]), GROUP=$withval) AC_MSG_RESULT($GROUP) - -if test x$GROUP != x; then - INSTALL="$INSTALL -g $GROUP" -fi +test -n "$GROUP" && INSTALL="$INSTALL -g $GROUP" ################################################################################ dnl -- Setup device node ownership @@ -261,7 +255,7 @@ AC_ARG_ENABLE(lvm1_fallback, LVM1_FALLBACK=$enableval, LVM1_FALLBACK=no) AC_MSG_RESULT($LVM1_FALLBACK) -if test x$LVM1_FALLBACK = xyes; then +if test "$LVM1_FALLBACK" = yes; then AC_DEFINE([LVM1_FALLBACK], 1, [Define to 1 if 'lvm' should fall back to using LVM1 binaries if device-mapper is missing from the kernel]) fi @@ -273,17 +267,15 @@ AC_ARG_WITH(lvm1, [LVM1 metadata support: internal/shared/none [[TYPE=internal]]]), LVM1=$withval, LVM1=internal) -AC_MSG_RESULT($LVM1) -if [[ "x$LVM1" != xnone -a "x$LVM1" != xinternal -a "x$LVM1" != xshared ]]; - then AC_MSG_ERROR( ---with-lvm1 parameter invalid -) -fi; +AC_MSG_RESULT($LVM1) -if test x$LVM1 = xinternal; then - AC_DEFINE([LVM1_INTERNAL], 1, [Define to 1 to include built-in support for LVM1 metadata.]) -fi +case "$LVM1" in + none|share) ;; + internal) AC_DEFINE([LVM1_INTERNAL], 1, + [Define to 1 to include built-in support for LVM1 metadata.]) ;; + *) AC_MSG_ERROR([--with-lvm1 parameter invalid]) ;; +esac ################################################################################ dnl -- format_pool inclusion type @@ -295,15 +287,12 @@ AC_ARG_WITH(pool, POOL=$withval, POOL=internal) AC_MSG_RESULT($POOL) -if [[ "x$POOL" != xnone -a "x$POOL" != xinternal -a "x$POOL" != xshared ]]; - then AC_MSG_ERROR( ---with-pool parameter invalid -) -fi; - -if test x$POOL = xinternal; then - AC_DEFINE([POOL_INTERNAL], 1, [Define to 1 to include built-in support for GFS pool metadata.]) -fi +case "$POOL" in + none|shared) ;; + internal) AC_DEFINE([POOL_INTERNAL], 1, + [Define to 1 to include built-in support for GFS pool metadata.]) ;; + *) AC_MSG_ERROR([--with-pool parameter invalid]) +esac ################################################################################ dnl -- cluster_locking inclusion type @@ -315,15 +304,12 @@ AC_ARG_WITH(cluster, CLUSTER=$withval) AC_MSG_RESULT($CLUSTER) -if [[ "x$CLUSTER" != xnone -a "x$CLUSTER" != xinternal -a "x$CLUSTER" != xshared ]]; - then AC_MSG_ERROR( ---with-cluster parameter invalid -) -fi; - -if test x$CLUSTER = xinternal; then - AC_DEFINE([CLUSTER_LOCKING_INTERNAL], 1, [Define to 1 to include built-in support for clustered LVM locking.]) -fi +case "$CLUSTER" in + none|shared) ;; + internal) AC_DEFINE([CLUSTER_LOCKING_INTERNAL], 1, + [Define to 1 to include built-in support for clustered LVM locking.]) ;; + *) AC_MSG_ERROR([--with-cluster parameter invalid]) ;; +esac ################################################################################ dnl -- snapshots inclusion type @@ -335,15 +321,12 @@ AC_ARG_WITH(snapshots, SNAPSHOTS=$withval, SNAPSHOTS=internal) AC_MSG_RESULT($SNAPSHOTS) -if [[ "x$SNAPSHOTS" != xnone -a "x$SNAPSHOTS" != xinternal -a "x$SNAPSHOTS" != xshared ]]; - then AC_MSG_ERROR( ---with-snapshots parameter invalid -) -fi; - -if test x$SNAPSHOTS = xinternal; then - AC_DEFINE([SNAPSHOT_INTERNAL], 1, [Define to 1 to include built-in support for snapshots.]) -fi +case "$SNAPSHOTS" in + none|shared) ;; + internal) AC_DEFINE([SNAPSHOT_INTERNAL], 1, + [Define to 1 to include built-in support for snapshots.]) ;; + *) AC_MSG_ERROR([--with-snapshots parameter invalid]) ;; +esac ################################################################################ dnl -- mirrors inclusion type @@ -355,15 +338,12 @@ AC_ARG_WITH(mirrors, MIRRORS=$withval, MIRRORS=internal) AC_MSG_RESULT($MIRRORS) -if [[ "x$MIRRORS" != xnone -a "x$MIRRORS" != xinternal -a "x$MIRRORS" != xshared ]]; - then AC_MSG_ERROR( ---with-mirrors parameter invalid -) -fi; - -if test x$MIRRORS = xinternal; then - AC_DEFINE([MIRRORED_INTERNAL], 1, [Define to 1 to include built-in support for mirrors.]) -fi +case "$MIRRORS" in + none|shared) ;; + internal) AC_DEFINE([MIRRORED_INTERNAL], 1, + [Define to 1 to include built-in support for mirrors.]) ;; + *) AC_MSG_ERROR([--with-mirrors parameter invalid]) ;; +esac ################################################################################ dnl -- raid inclusion type @@ -375,15 +355,12 @@ AC_ARG_WITH(raid, RAID=$withval, RAID=internal) AC_MSG_RESULT($RAID) -if [[ "x$RAID" != xnone -a "x$RAID" != xinternal -a "x$RAID" != xshared ]]; - then AC_MSG_ERROR( ---with-raid parameter invalid -) -fi; - -if test x$RAID = xinternal; then - AC_DEFINE([RAID_INTERNAL], 1, [Define to 1 to include built-in support for raid.]) -fi +case "$RAID" in + none|shared) ;; + internal) AC_DEFINE([RAID_INTERNAL], 1, + [Define to 1 to include built-in support for raid.]) ;; + *) AC_MSG_ERROR([--with-raid parameter invalid]) ;; +esac ################################################################################ dnl -- asynchronous volume replicator inclusion type @@ -432,7 +409,7 @@ AC_MSG_RESULT($THIN) case "$THIN" in none|shared) ;; internal) AC_DEFINE([THIN_INTERNAL], 1, - [Define to 1 to include built-in support for thin provisioning.]) ;; + [Define to 1 to include built-in support for thin provisioning.]) ;; *) AC_MSG_ERROR([--with-thin parameter invalid ($THIN)]) ;; esac @@ -528,15 +505,11 @@ AC_ARG_WITH(cache, CACHE=$withval, CACHE=none) AC_MSG_RESULT($CACHE) -if [[ "x$CACHE" != xnone -a "x$CACHE" != xinternal -a "x$CACHE" != xshared ]]; - then AC_MSG_ERROR( ---with-cache parameter invalid -) -fi; - -if test x$CACHE = xinternal; then - AC_DEFINE([CACHE_INTERNAL], 1, [Define to 1 to include built-in support for cache.]) -fi +case "$CACHE" in + none|shared) ;; + internal) AC_DEFINE([CACHE_INTERNAL], 1, [Define to 1 to include built-in support for cache.]) ;; + *) AC_MSG_ERROR([--with-cache parameter invalid]) ;; +esac ################################################################################ dnl -- Disable readline @@ -573,9 +546,11 @@ dnl -- this is required because PKG_CHECK_MODULES macro is expanded dnl -- to initialize the pkg-config environment only at the first invokation, dnl -- that would be conditional in this configure.in. pkg_config_init() { - PKG_CHECK_MODULES(PKGCONFIGINIT, pkgconfiginit, [], - [AC_MSG_RESULT([pkg-config initialized])]) - PKGCONFIG_INIT=1 + if test "$PKGCONFIG_INIT" != 1; then + PKG_CHECK_MODULES(PKGCONFIGINIT, pkgconfiginit, [], + [AC_MSG_RESULT([pkg-config initialized])]) + PKGCONFIG_INIT=1 + fi } ################################################################################ @@ -617,20 +592,14 @@ AC_ARG_WITH(clvmd, * none (disable build) [[TYPE=none]]], CLVMD=$withval, CLVMD=none) -if test x$CLVMD = xyes; then - CLVMD=all -fi +test "$CLVMD" = yes && CLVMD=all AC_MSG_RESULT($CLVMD) dnl -- If clvmd enabled without cluster locking, automagically include it -if test x$CLVMD != xnone && test x$CLUSTER = xnone; then - CLUSTER=internal -fi +test "$CLVMD" != none -a "$CLUSTER" = none && CLUSTER=internal dnl -- init pkgconfig if required -if test x$CLVMD != xnone && test x$PKGCONFIG_INIT != x1; then - pkg_config_init -fi +test "$CLVMD" != none && pkg_config_init dnl -- Express clvmd init script Required-Start / Required-Stop CLVMD_CMANAGERS="" @@ -655,9 +624,7 @@ if [[ `expr x"$CLVMD" : '.*openais.*'` != 0 ]]; then BUILDOPENAIS=yes CLVMD_CMANAGERS="$CLVMD_CMANAGERS openais" fi -if test x$CLVMD_NEEDS_QDISKD != xno; then - CLVMD_CMANAGERS="$CLVMD_CMANAGERS qdiskd" -fi +test "$CLVMD_NEEDS_QDISKD" != no && CLVMD_CMANAGERS="$CLVMD_CMANAGERS qdiskd" dnl -- define a soft bailout if we are autodetecting soft_bailout() { @@ -668,10 +635,10 @@ hard_bailout() { AC_MSG_ERROR([bailing out]) } -dnl -- if clvmd=all then set soft_bailout (we don't want to error) +dnl -- if clvmd=all then set soft_bailout (we do not want to error) dnl -- and set all builds to yes. We need to do this here dnl -- to skip the openais|corosync sanity check above. -if test x$CLVMD = xall; then +if test "$CLVMD" = all; then bailout=soft_bailout BUILDCMAN=yes BUILDCOROSYNC=yes @@ -695,7 +662,7 @@ check_lib_no_libs() { } dnl -- Look for cman libraries if required. -if test x$BUILDCMAN = xyes; then +if test "$BUILDCMAN" = yes; then PKG_CHECK_MODULES(CMAN, libcman, [HAVE_CMAN=yes], [NOTFOUND=0 AC_CHECK_HEADERS(libcman.h,,$bailout) @@ -709,25 +676,24 @@ if test x$BUILDCMAN = xyes; then CHECKDLM=yes fi -dnl -- Look for corosync that's required also for openais build +dnl -- Look for corosync that is required also for openais build dnl -- only enough recent version of corosync ship pkg-config files. dnl -- We can safely rely on that to detect the correct bits. -if test x$BUILDCOROSYNC = xyes || \ - test x$BUILDOPENAIS = xyes; then +if test "$BUILDCOROSYNC" = yes -o "$BUILDOPENAIS" = yes; then PKG_CHECK_MODULES(COROSYNC, corosync, [HAVE_COROSYNC=yes], $bailout) CHECKCONFDB=yes CHECKCMAP=yes fi dnl -- Look for corosync libraries if required. -if test x$BUILDCOROSYNC = xyes; then +if test "$BUILDCOROSYNC" = yes; then PKG_CHECK_MODULES(QUORUM, libquorum, [HAVE_QUORUM=yes], $bailout) CHECKCPG=yes CHECKDLM=yes fi dnl -- Look for openais libraries if required. -if test x$BUILDOPENAIS = xyes; then +if test "$BUILDOPENAIS" = yes; then PKG_CHECK_MODULES(SALCK, libSaLck, [HAVE_SALCK=yes], $bailout) CHECKCPG=yes fi @@ -738,17 +704,14 @@ dnl -- Check confdb library. dnl -- mandatory for corosync < 2.0 build. dnl -- optional for openais/cman build. -if test x$CHECKCONFDB = xyes; then +if test "$CHECKCONFDB" = yes; then PKG_CHECK_MODULES(CONFDB, libconfdb, - [HAVE_CONFDB=yes], - [HAVE_CONFDB=no]) + [HAVE_CONFDB=yes], [HAVE_CONFDB=no]) - AC_CHECK_HEADERS(corosync/confdb.h, - [HAVE_CONFDB_H=yes], - [HAVE_CONFDB_H=no]) + AC_CHECK_HEADERS([corosync/confdb.h], + [HAVE_CONFDB_H=yes], [HAVE_CONFDB_H=no]) - if test x$HAVE_CONFDB != xyes && \ - test x$HAVE_CONFDB_H = xyes; then + if test "$HAVE_CONFDB" != yes -a "$HAVE_CONFDB_H" = yes; then check_lib_no_libs confdb confdb_initialize AC_MSG_RESULT([no pkg for confdb, using -lconfdb]) CONFDB_LIBS="-lconfdb" @@ -759,17 +722,14 @@ fi dnl -- Check cmap library dnl -- mandatory for corosync >= 2.0 build. -if test x$CHECKCMAP = xyes; then +if test "$CHECKCMAP" = yes; then PKG_CHECK_MODULES(CMAP, libcmap, - [HAVE_CMAP=yes], - [HAVE_CMAP=no]) + [HAVE_CMAP=yes], [HAVE_CMAP=no]) - AC_CHECK_HEADERS(corosync/cmap.h, - [HAVE_CMAP_H=yes], - [HAVE_CMAP_H=no]) + AC_CHECK_HEADERS([corosync/cmap.h], + [HAVE_CMAP_H=yes], [HAVE_CMAP_H=no]) - if test x$HAVE_CMAP != xyes && \ - test x$HAVE_CMAP_H = xyes; then + if test "$HAVE_CMAP" != yes -a "$HAVE_CMAP_H" = yes; then check_lib_no_libs cmap cmap_initialize AC_MSG_RESULT([no pkg for cmap, using -lcmap]) CMAP_LIBS="-lcmap" @@ -777,24 +737,21 @@ if test x$CHECKCMAP = xyes; then fi fi -if test x$BUILDCOROSYNC = xyes; then - if test x$HAVE_CMAP != xyes && \ - test x$HAVE_CONFDB != xyes && \ - test x$CLVMD != xall; then - AC_MSG_ERROR([bailing out... cmap (corosync >= 2.0) or confdb (corosync < 2.0) library is required]) - fi +if test "$BUILDCOROSYNC" = yes -a \ + "$HAVE_CMAP" != yes -a "$HAVE_CONFDB" != yes -a "$CLVMD" != all; then + AC_MSG_ERROR([bailing out... cmap (corosync >= 2.0) or confdb (corosync < 2.0) library is required]) fi dnl -- Check cpg library. -if test x$CHECKCPG = xyes; then - PKG_CHECK_MODULES(CPG, libcpg, [HAVE_CPG=yes], $bailout) +if test "$CHECKCPG" = yes; then + PKG_CHECK_MODULES(CPG, libcpg, [HAVE_CPG=yes], [$bailout]) fi dnl -- Check dlm library. -if test x$CHECKDLM = xyes; then +if test "$CHECKDLM" = yes; then PKG_CHECK_MODULES(DLM, libdlm, [HAVE_DLM=yes], [NOTFOUND=0 - AC_CHECK_HEADERS(libdlm.h,,$bailout) + AC_CHECK_HEADERS(libdlm.h,,[$bailout]) check_lib_no_libs dlm dlm_lock -lpthread if test $NOTFOUND = 0; then AC_MSG_RESULT([no pkg for libdlm, using -ldlm]) @@ -806,54 +763,48 @@ fi dnl -- If we are autodetecting, we need to re-create dnl -- the depedencies checks and set a proper CLVMD, dnl -- together with init script Required-Start/Stop entries. -if test x$CLVMD = xall; then +if test "$CLVMD" = all; then CLVMD=none CLVMD_CMANAGERS="" CLVMD_NEEDS_QDISKD=no - if test x$HAVE_CMAN = xyes && \ - test x$HAVE_DLM = xyes; then + if test "$HAVE_CMAN" = yes -a \ + "$HAVE_DLM" = yes; then AC_MSG_RESULT([Enabling clvmd cman cluster manager]) CLVMD="$CLVMD,cman" CLVMD_CMANAGERS="$CLVMD_CMANAGERS cman" CLVMD_NEEDS_QDISKD=yes fi - if test x$HAVE_COROSYNC = xyes && \ - test x$HAVE_QUORUM = xyes && \ - test x$HAVE_CPG = xyes && \ - test x$HAVE_DLM = xyes; then - if test x$HAVE_CONFDB = xyes || test x$HAVE_CMAP = xyes; then + if test "$HAVE_COROSYNC" = yes -a \ + "$HAVE_QUORUM" = yes -a \ + "$HAVE_CPG" = yes -a \ + "$HAVE_DLM" = yes; then + if test "$HAVE_CONFDB" = yes -o "$HAVE_CMAP" = yes; then AC_MSG_RESULT([Enabling clvmd corosync cluster manager]) CLVMD="$CLVMD,corosync" CLVMD_CMANAGERS="$CLVMD_CMANAGERS corosync" fi fi - if test x$HAVE_COROSYNC = xyes && \ - test x$HAVE_CPG = xyes && \ - test x$HAVE_SALCK = xyes; then + if test "$HAVE_COROSYNC" = yes -a \ + "$HAVE_CPG" = yes -a \ + "$HAVE_SALCK" = yes; then AC_MSG_RESULT([Enabling clvmd openais cluster manager]) CLVMD="$CLVMD,openais" CLVMD_CMANAGERS="$CLVMD_CMANAGERS openais" fi - if test x$CLVMD_NEEDS_QDISKD != xno; then - CLVMD_CMANAGERS="$CLVMD_CMANAGERS qdiskd" - fi - if test x$CLVMD = xnone; then - AC_MSG_RESULT([Disabling clvmd build. No cluster manager detected.]) - fi + test "$CLVMD_NEEDS_QDISKD" != no && CLVMD_CMANAGERS="$CLVMD_CMANAGERS qdiskd" + test "$CLVMD" = none && AC_MSG_RESULT([Disabling clvmd build. No cluster manager detected.]) fi dnl -- Fixup CLVMD_CMANAGERS with new corosync dnl -- clvmd built with corosync >= 2.0 needs dlm (either init or systemd service) dnl -- to be started. if [[ `expr x"$CLVMD" : '.*corosync.*'` != 0 ]]; then - if test x$HAVE_CMAP = xyes; then - CLVMD_CMANAGERS="$CLVMD_CMANAGERS dlm" - fi + test "$HAVE_CMAP" = yes && CLVMD_CMANAGERS="$CLVMD_CMANAGERS dlm" fi ################################################################################ dnl -- clvmd pidfile -if test "x$CLVMD" != xnone; then +if test "$CLVMD" != none; then AC_ARG_WITH(clvmd-pidfile, AC_HELP_STRING([--with-clvmd-pidfile=PATH], [clvmd pidfile [[PID_DIR/clvmd.pid]]]), @@ -876,7 +827,7 @@ BUILD_CMIRRORD=$CMIRRORD ################################################################################ dnl -- cmirrord pidfile -if test "x$BUILD_CMIRRORD" = xyes; then +if test "$BUILD_CMIRRORD" = yes; then AC_ARG_WITH(cmirrord-pidfile, AC_HELP_STRING([--with-cmirrord-pidfile=PATH], [cmirrord pidfile [[PID_DIR/cmirrord.pid]]]), @@ -888,20 +839,15 @@ fi ################################################################################ dnl -- Look for corosync libraries if required. -if [[ "x$BUILD_CMIRRORD" = xyes ]]; then - dnl -- init pkgconfig if required - if test x$PKGCONFIG_INIT != x1; then - pkg_config_init - fi +if [[ "$BUILD_CMIRRORD" = yes ]]; then + pkg_config_init AC_DEFINE([CMIRROR_HAS_CHECKPOINT], 1, [Define to 1 to include libSaCkpt.]) PKG_CHECK_MODULES(SACKPT, libSaCkpt, [HAVE_SACKPT=yes], [AC_MSG_RESULT([no libSaCkpt, compiling without it]) AC_DEFINE([CMIRROR_HAS_CHECKPOINT], 0, [Define to 0 to exclude libSaCkpt.])]) - if test x$HAVE_CPG != xyes; then - PKG_CHECK_MODULES(CPG, libcpg) - fi + test "$HAVE_CPG" != yes && PKG_CHECK_MODULES(CPG, libcpg) fi ################################################################################ @@ -912,7 +858,7 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable debugging]), AC_MSG_RESULT($DEBUG) dnl -- Normally turn off optimisation for debug builds -if test x$DEBUG = xyes; then +if test "$DEBUG" = yes; then COPTIMISE_FLAG= else CSCOPE_CMD= @@ -937,25 +883,24 @@ AC_MSG_RESULT($COPTIMISE_FLAG) dnl -- Enable profiling AC_MSG_CHECKING(whether to gather gcov profiling data) AC_ARG_ENABLE(profiling, - AC_HELP_STRING(--enable-profiling, [gather gcov profiling data]), + AC_HELP_STRING([--enable-profiling], + [gather gcov profiling data]), PROFILING=$enableval, PROFILING=no) AC_MSG_RESULT($PROFILING) -if test "x$PROFILING" = xyes; then +if test "$PROFILING" = yes; then COPTIMISE_FLAG="$COPTIMISE_FLAG -fprofile-arcs -ftest-coverage" - AC_PATH_PROG(LCOV, lcov) - AC_PATH_PROG(GENHTML, genhtml) - if test -z "$LCOV" -o -z "$GENHTML"; then - AC_MSG_ERROR([lcov and genhtml are required for profiling]) - fi - AC_PATH_PROG(GENPNG, genpng) + AC_PATH_TOOL(LCOV, lcov) + AC_PATH_TOOL(GENHTML, genhtml) + test -z "$LCOV" -o -z "$GENHTML" && AC_MSG_ERROR([lcov and genhtml are required for profiling]) + AC_PATH_TOOL(GENPNG, genpng) if test -n "$GENPNG"; then AC_MSG_CHECKING([whether $GENPNG has all required modules]) - if $GENPNG --help > /dev/null 2>&1 ; then + if "$GENPNG" --help > /dev/null 2>&1 ; then AC_MSG_RESULT(ok) GENHTML="$GENHTML --frames" else - AC_MSG_RESULT(not supported) + AC_MSG_RESULT([not supported]) AC_MSG_WARN([GD.pm perl module is not installed]) GENPNG= fi @@ -966,14 +911,13 @@ fi dnl -- Enable testing AC_MSG_CHECKING(whether to enable unit testing) AC_ARG_ENABLE(testing, - AC_HELP_STRING(--enable-testing, [enable testing targets in the makefile]), - TESTING=$enableval, TESTING=no) + AC_HELP_STRING([--enable-testing], + [enable testing targets in the makefile]), + TESTING=$enableval, TESTING=no) AC_MSG_RESULT($TESTING) if test "$TESTING" = yes; then - if test x$PKGCONFIG_INIT != x1; then - pkg_config_init - fi + pkg_config_init PKG_CHECK_MODULES(CUNIT, cunit >= 2.0) fi @@ -981,15 +925,17 @@ fi dnl -- Enable valgrind awareness of memory pools AC_MSG_CHECKING(whether to enable valgrind awareness of pools) AC_ARG_ENABLE(valgrind_pool, - AC_HELP_STRING(--enable-valgrind-pool, [enable valgrind awareness of pools]), + AC_HELP_STRING([--enable-valgrind-pool], + [enable valgrind awareness of pools]), VALGRIND_POOL=$enableval, VALGRIND_POOL=no) AC_MSG_RESULT($VALGRIND_POOL) if test "$VALGRIND_POOL" = yes; then - PKG_CHECK_MODULES(VALGRIND, valgrind, [], [AC_MSG_ERROR(bailing out)]) - AC_DEFINE([VALGRIND_POOL], 1, [Enable a valgrind aware build of pool]) - AC_SUBST(VALGRIND_POOL) - AC_SUBST(VALGRIND_CFLAGS) + pkg_config_init + PKG_CHECK_MODULES(VALGRIND, valgrind, [], [AC_MSG_ERROR(bailing out)]) + AC_DEFINE([VALGRIND_POOL], 1, [Enable a valgrind aware build of pool]) + AC_SUBST(VALGRIND_POOL) + AC_SUBST(VALGRIND_CFLAGS) fi ################################################################################ @@ -1001,7 +947,7 @@ AC_ARG_ENABLE(devmapper, DEVMAPPER=$enableval) AC_MSG_RESULT($DEVMAPPER) -if test x$DEVMAPPER = xyes; then +if test "$DEVMAPPER" = yes; then AC_DEFINE([DEVMAPPER_SUPPORT], 1, [Define to 1 to enable LVM2 device-mapper interaction.]) fi @@ -1016,7 +962,7 @@ AC_MSG_RESULT($LVMETAD) BUILD_LVMETAD=$LVMETAD -if test x$BUILD_LVMETAD = xyes; then +if test "$BUILD_LVMETAD" = yes; then AC_DEFINE([LVMETAD_SUPPORT], 1, [Define to 1 to include code that uses lvmetad.]) AC_ARG_WITH(lvmetad-pidfile, @@ -1037,22 +983,16 @@ AC_ARG_ENABLE(blkid_wiping, BLKID_WIPING=$enableval, BLKID_WIPING=maybe) AC_MSG_RESULT($BLKID_WIPING) -if test x$BLKID_WIPING != xno; then - dnl -- init pkgconfig if required - if test x$PKGCONFIG_INIT != x1; then - pkg_config_init - fi +if test "$BLKID_WIPING" != no; then + pkg_config_init PKG_CHECK_MODULES(BLKID, blkid >= 2.24, - [if test x$BLKID_WIPING = xmaybe; then - BLKID_WIPING=yes - fi], - [if test x$BLKID_WIPING = xmaybe; then - BLKID_WIPING=no - else - AC_MSG_ERROR([bailing out... blkid library >= 2.24 is required]) - fi - ]) - if test x$BLKID_WIPING = xyes; then + [test "$BLKID_WIPING" = maybe && BLKID_WIPING=yes], + [if test "$BLKID_WIPING" = maybe; then + BLKID_WIPING=no + else + AC_MSG_ERROR([bailing out... blkid library >= 2.24 is required]) + fi]) + if test "$BLKID_WIPING" = yes; then BLKID_PC="blkid" AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.]) fi @@ -1071,16 +1011,13 @@ AC_MSG_RESULT($UDEV_SYSTEMD_BACKGROUND_JOBS) dnl -- Enable udev synchronisation AC_MSG_CHECKING(whether to enable synchronisation with udev processing) AC_ARG_ENABLE(udev_sync, - AC_HELP_STRING([--enable-udev_sync], + AC_HELP_STRING([--enable-udev_sync], [enable synchronisation with udev processing]), UDEV_SYNC=$enableval, UDEV_SYNC=no) AC_MSG_RESULT($UDEV_SYNC) -if test x$UDEV_SYNC = xyes; then - dnl -- init pkgconfig if required - if test x$PKGCONFIG_INIT != x1; then - pkg_config_init - fi +if test "$UDEV_SYNC" = yes; then + pkg_config_init PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) fi @@ -1101,14 +1038,16 @@ AC_ARG_ENABLE(udev_rule_exec_detection, AC_MSG_RESULT($UDEV_RULE_EXEC_DETECTION) dnl -- Check support for built-in blkid against target udev version -AC_MSG_CHECKING(whether udev supports built-in blkid) -test x$PKGCONFIG_INIT != x1 && pkg_config_init -if $($PKG_CONFIG --atleast-version=176 libudev); then - UDEV_HAS_BUILTIN_BLKID=yes -else - UDEV_HAS_BUILTIN_BLKID=no +if test "$UDEV_RULE" != no ; then + AC_MSG_CHECKING(whether udev supports built-in blkid) + pkg_config_init + if $("$PKG_CONFIG" --atleast-version=176 libudev); then + UDEV_HAS_BUILTIN_BLKID=yes + else + UDEV_HAS_BUILTIN_BLKID=no + fi + AC_MSG_RESULT($UDEV_HAS_BUILTIN_BLKID) fi -AC_MSG_RESULT($UDEV_HAS_BUILTIN_BLKID) ################################################################################ dnl -- Compatibility mode @@ -1117,12 +1056,10 @@ AC_ARG_ENABLE(compat, [enable support for old device-mapper versions]), DM_COMPAT=$enableval, DM_COMPAT=no) -if test x$DM_COMPAT = xyes; then - AC_MSG_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.] - ) +if test "$DM_COMPAT" = yes; then + AC_MSG_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.]) fi ################################################################################ @@ -1133,7 +1070,7 @@ AC_ARG_ENABLE(units-compat, that do not use KiB-style unit suffixes]), UNITS_COMPAT=$enableval, UNITS_COMPAT=no) -if test x$UNITS_COMPAT = xyes; then +if test "$UNITS_COMPAT" = yes; then AC_DEFINE([DEFAULT_SI_UNIT_CONSISTENCY], 0, [Define to 0 to reinstate the pre-2.02.54 handling of unit suffixes.]) fi @@ -1152,7 +1089,7 @@ AC_ARG_ENABLE(o_direct, ODIRECT=$enableval) AC_MSG_RESULT($ODIRECT) -if test x$ODIRECT = xyes; then +if test "$ODIRECT" = yes; then AC_DEFINE([O_DIRECT_SUPPORT], 1, [Define to 1 to enable O_DIRECT support.]) fi @@ -1164,7 +1101,7 @@ AC_ARG_ENABLE(applib, APPLIB=$enableval, APPLIB=no) AC_MSG_RESULT($APPLIB) AC_SUBST([LVM2APP_LIB]) -test x$APPLIB = xyes \ +test "$APPLIB" = yes \ && LVM2APP_LIB=-llvm2app \ || LVM2APP_LIB= @@ -1176,7 +1113,7 @@ AC_ARG_ENABLE(cmdlib, CMDLIB=$enableval, CMDLIB=no) AC_MSG_RESULT($CMDLIB) AC_SUBST([LVM2CMD_LIB]) -test x$CMDLIB = xyes \ +test "$CMDLIB" = yes \ && LVM2CMD_LIB=-llvm2cmd \ || LVM2CMD_LIB= @@ -1188,30 +1125,17 @@ AC_ARG_ENABLE(python_bindings, PYTHON_BINDINGS=$enableval, PYTHON_BINDINGS=no) AC_MSG_RESULT($PYTHON_BINDINGS) -if test x$PYTHON_BINDINGS = xyes; then - if test x$APPLIB != xyes; then - AC_MSG_ERROR( - --enable-python_bindings requires --enable-applib - ) - fi - - AC_PATH_PROG(PYTHON, python, notfound) - if test x$PYTHON == xnotfound; then - AC_MSG_ERROR( -[python is required for --enable-python_bindings but cannot be found] - ) - fi +if test "$PYTHON_BINDINGS" = yes; then + test "$APPLIB" != yes && AC_MSG_ERROR([--enable-python_bindings requires --enable-applib]) - AC_PATH_PROG(PYTHON_CONFIG, python-config, notfound) - if test x$PYTHON_CONFIG == xnotfound; then - AC_MSG_ERROR( -[python headers are required for --enable-python_bindings but cannot be found] - ) - fi + AC_PATH_TOOL(PYTHON, python) + test -z "$PYTHON" && AC_MSG_ERROR([python is required for --enable-python_bindings but cannot be found]) - PYTHON_INCDIRS=`$PYTHON_CONFIG --includes` - PYTHON_LIBDIRS=`$PYTHON_CONFIG --libs` + AC_PATH_TOOL(PYTHON_CONFIG, python-config) + test -z "$PYTHON_CONFIG" && AC_MSG_ERROR([python headers are required for --enable-python_bindings but cannot be found]) + PYTHON_INCDIRS=`"$PYTHON_CONFIG" --includes` + PYTHON_LIBDIRS=`"$PYTHON_CONFIG" --libs` fi ################################################################################ @@ -1252,21 +1176,15 @@ AC_MSG_RESULT($DMEVENTD) BUILD_DMEVENTD=$DMEVENTD dnl -- dmeventd currently requires internal mirror support -if test x$DMEVENTD = xyes; then - if test x$MIRRORS != xinternal; then - AC_MSG_ERROR( - --enable-dmeventd currently requires --with-mirrors=internal - ) +if test "$DMEVENTD" = yes; then + if test "$MIRRORS" != internal; then + AC_MSG_ERROR([--enable-dmeventd currently requires --with-mirrors=internal]) fi - if test x$CMDLIB = xno; then - AC_MSG_ERROR( - --enable-dmeventd requires --enable-cmdlib to be used as well - ) + if test "$CMDLIB" = no; then + AC_MSG_ERROR([--enable-dmeventd requires --enable-cmdlib to be used as well]) fi -fi -if test x$DMEVENTD = xyes; then - AC_DEFINE([DMEVENTD], 1, [Define to 1 to enable the device-mapper event daemon.]) + AC_DEFINE([DMEVENTD], 1, [Define to 1 to enable the device-mapper event daemon.]) fi ################################################################################ @@ -1284,29 +1202,24 @@ AC_CHECK_LIB(c, canonicalize_file_name, ################################################################################ dnl -- Clear default exec_prefix - install into /sbin rather than /usr/sbin -if [[ "x$exec_prefix" = xNONE -a "x$prefix" = xNONE ]]; - then exec_prefix=""; -fi; +test "$exec_prefix" = NONE -a "$prefix" = NONE && exec_prefix="" ################################################################################ dnl -- Check for dlopen -AC_CHECK_LIB(dl, dlopen, [ - AC_DEFINE([HAVE_LIBDL], 1, [Define to 1 if dynamic libraries are available.]) - DL_LIBS="-ldl" - HAVE_LIBDL=yes ], [ - DL_LIBS= - HAVE_LIBDL=no ]) +AC_CHECK_LIB(dl, dlopen, + [AC_DEFINE([HAVE_LIBDL], 1, [Define to 1 if dynamic libraries are available.]) + DL_LIBS="-ldl" + HAVE_LIBDL=yes], + [DL_LIBS= + HAVE_LIBDL=no ]) ################################################################################ dnl -- Check for shared/static conflicts -if [[ $ "x$LVM1" = xshared -o "x$POOL" = xshared -o "x$CLUSTER" = xshared \ - -o "x$SNAPSHOTS" = xshared -o "x$MIRRORS" = xshared \ - -o "x$RAID" = xshared \ - -o "x$CACHE" = xshared \ - $ -a "x$STATIC_LINK" = xyes ]]; - then AC_MSG_ERROR( -Features cannot be 'shared' when building statically -) +if [[ $ "$LVM1" = shared -o "$POOL" = shared -o "$CLUSTER" = shared \ + -o "$SNAPSHOTS" = shared -o "$MIRRORS" = shared \ + -o "$RAID" = shared -o "$CACHE" = shared \ + $ -a "$STATIC_LINK" = yes ]]; then + AC_MSG_ERROR([Features cannot be 'shared' when building statically]) fi ################################################################################ @@ -1323,7 +1236,7 @@ AC_MSG_RESULT($SELINUX) ################################################################################ dnl -- Check for selinux -if test x$SELINUX = xyes; then +if test "$SELINUX" = yes; then AC_CHECK_LIB([sepol], [sepol_check_context], [ AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.]) SELINUX_LIBS="-lsepol"]) @@ -1343,10 +1256,10 @@ fi ################################################################################ dnl -- Check for realtime clock support -if test x$REALTIME = xyes; then +if test "$REALTIME" = yes; then AC_CHECK_LIB(rt, clock_gettime, HAVE_REALTIME=yes, HAVE_REALTIME=no) - if test x$HAVE_REALTIME = xyes; then + if test "$HAVE_REALTIME" = yes; then AC_DEFINE([HAVE_REALTIME], 1, [Define to 1 to include support for realtime clock.]) LIBS="-lrt $LIBS" else @@ -1409,15 +1322,13 @@ AC_ARG_ENABLE(nls, INTL=$enableval, INTL=no) AC_MSG_RESULT($INTL) -if test x$INTL = xyes; then +if test "$INTL" = yes; then # FIXME - Move this - can be device-mapper too INTL_PACKAGE="lvm2" - AC_PATH_PROG(MSGFMT, msgfmt) - if [[ "x$MSGFMT" == x ]]; - then AC_MSG_ERROR( - msgfmt not found in path $PATH - ) - fi; + AC_PATH_TOOL(MSGFMT, msgfmt) + if [[ -z "$MSGFMT" ]]; then + AC_MSG_ERROR([msgfmt not found in path $PATH]) + fi AC_ARG_WITH(localedir, AC_HELP_STRING([--with-localedir=DIR], @@ -1466,22 +1377,15 @@ AC_ARG_WITH(systemdsystemunitdir, AC_HELP_STRING([--with-systemdsystemunitdir=DIR], [systemd service files in DIR]), systemdsystemunitdir=$withval, - dnl -- init pkgconfig if required - test x$PKGCONFIG_INIT != x1 && pkg_config_init - pkg_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)) + pkg_config_init + pkg_systemdsystemunitdir=$("$PKG_CONFIG" --variable=systemdsystemunitdir systemd)) -if test -n "$pkg_systemdsystemunitdir"; then - systemdsystemunitdir=$pkg_systemdsystemunitdir; -fi +test -n "$pkg_systemdsystemunitdir" && systemdsystemunitdir=$pkg_systemdsystemunitdir +test -z "$systemdsystemunitdir" && systemdsystemunitdir='${exec_prefix}/lib/systemd/system'; -if test -z "$systemdsystemunitdir"; then - systemdsystemunitdir='${exec_prefix}/lib/systemd/system'; -fi +systemdutildir=$("$PKG_CONFIG" --variable=systemdutildir systemd) +test -z "$systemdutildir" && systemdutildir='${exec_prefix}/lib/systemd'; -systemdutildir=$($PKG_CONFIG --variable=systemdutildir systemd) -if test -z "$systemdutildir"; then - systemdutildir='${exec_prefix}/lib/systemd'; -fi ################################################################################ AC_ARG_WITH(tmpfilesdir, AC_HELP_STRING([--with-tmpfilesdir=DIR], @@ -1489,42 +1393,42 @@ AC_ARG_WITH(tmpfilesdir, tmpfilesdir=$withval, tmpfilesdir='${prefix}/lib/tmpfiles.d') ################################################################################ dnl -- Ensure additional headers required -if test x$READLINE = xyes; then - AC_CHECK_HEADERS(readline/readline.h readline/history.h,,AC_MSG_ERROR(bailing out)) +if test "$READLINE" = yes; then + AC_CHECK_HEADERS(readline/readline.h readline/history.h,,hard_bailout) fi -if test x$CLVMD != xnone; then +if test "$CLVMD" != none; then AC_CHECK_HEADERS(mntent.h netdb.h netinet/in.h pthread.h search.h sys/mount.h sys/socket.h sys/uio.h sys/un.h utmpx.h,,AC_MSG_ERROR(bailing out)) - AC_CHECK_FUNCS(dup2 getmntent memmove select socket,,AC_MSG_ERROR(bailing out)) + AC_CHECK_FUNCS(dup2 getmntent memmove select socket,,hard_bailout) AC_FUNC_GETMNTENT AC_FUNC_SELECT_ARGTYPES fi -if test x$CLUSTER != xnone; then - AC_CHECK_HEADERS(sys/socket.h sys/un.h,,AC_MSG_ERROR(bailing out)) - AC_CHECK_FUNCS(socket,,AC_MSG_ERROR(bailing out)) +if test "$CLUSTER" != none; then + AC_CHECK_HEADERS(sys/socket.h sys/un.h,,hard_bailout) + AC_CHECK_FUNCS(socket,,hard_bailout) fi -if test x$DMEVENTD = xyes; then - AC_CHECK_HEADERS(arpa/inet.h,,AC_MSG_ERROR(bailing out)) +if test "$DMEVENTD" = yes; then + AC_CHECK_HEADERS(arpa/inet.h,,hard_bailout) fi -if test x$HAVE_LIBDL = xyes; then - AC_CHECK_HEADERS(dlfcn.h,,AC_MSG_ERROR(bailing out)) +if test "$HAVE_LIBDL" = yes; then + AC_CHECK_HEADERS(dlfcn.h,,hard_bailout) fi -if test x$INTL = xyes; then - AC_CHECK_HEADERS(libintl.h,,AC_MSG_ERROR(bailing out)) +if test "$INTL" = yes; then + AC_CHECK_HEADERS(libintl.h,,hard_bailout) fi -if test x$UDEV_SYNC = xyes; then - AC_CHECK_HEADERS(sys/ipc.h sys/sem.h,,AC_MSG_ERROR(bailing out)) +if test "$UDEV_SYNC" = yes; then + AC_CHECK_HEADERS(sys/ipc.h sys/sem.h,,hard_bailout) fi ################################################################################ -AC_PATH_PROG(MODPROBE_CMD, modprobe) +AC_PATH_TOOL(MODPROBE_CMD, modprobe) -if test x$MODPROBE_CMD != x; then +if test -n "$MODPROBE_CMD"; then AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) fi @@ -1536,9 +1440,9 @@ LVM_PATH="$lvm_exec_prefix/sbin/lvm" AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.]) if test "$CLVMD" != none; then - clvmd_prefix=$ac_default_prefix - CLVMD_PATH="$clvmd_prefix/sbin/clvmd" - test "$prefix" != NONE && clvmd_prefix=$prefix + clvmd_prefix=$ac_default_prefix + CLVMD_PATH="$clvmd_prefix/sbin/clvmd" + test "$prefix" != NONE && clvmd_prefix=$prefix AC_DEFINE_UNQUOTED(CLVMD_PATH, ["$CLVMD_PATH"], [Path to clvmd binary.]) fi @@ -1625,10 +1529,7 @@ AC_ARG_WITH(interface, AC_HELP_STRING([--with-interface=IFACE], [choose kernel interface (ioctl) [[ioctl]]]), interface=$withval, interface=ioctl) -if [[ "x$interface" != xioctl ]]; -then - AC_MSG_ERROR(--with-interface=ioctl required. fs no longer supported.) -fi +test "$interface" != ioctl && AC_MSG_ERROR([--with-interface=ioctl required. fs no longer supported.]) AC_MSG_RESULT($interface) ################################################################################ @@ -1859,8 +1760,6 @@ AC_OUTPUT test -n "$THIN_CONFIGURE_WARN" && AC_MSG_WARN([Support for thin provisioning is limited since some thin provisioning tools are missing!]) -test -n "$THIN_CHECK_VERSION_WARN" && AC_MSG_WARN(You should also install thin_check vsn 0.3.2 (or later) to use lvm2 thin provisioning) +test -n "$THIN_CHECK_VERSION_WARN" && AC_MSG_WARN([You should also install thin_check vsn 0.3.2 (or later) to use lvm2 thin provisioning]) -if test x$ODIRECT != xyes; then - AC_MSG_WARN(O_DIRECT disabled: low-memory pvmove may lock up) -fi +test "$ODIRECT" != yes && AC_MSG_WARN([O_DIRECT disabled: low-memory pvmove may lock up])

1 0

master - configure: accept 'none' as mangling mode
by Zdenek Kabelac 05 Jun '14

05 Jun '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b3ace4f9afaf3668… Commit: b3ace4f9afaf36688820b72fdca7dcc54928151f Parent: 93c2614e566c1aafae178c34838da21caf8ea16a Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 5 14:38:10 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 5 17:47:23 2014 +0200 configure: accept 'none' as mangling mode Since we advertise 'none' as mangling name, accept it. Keep it backward compatible and leave disabled option still working (though I guess there is likely no user of this option...) --- configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 807ad32..b16d34a 100644 --- a/configure.in +++ b/configure.in @@ -244,7 +244,7 @@ AC_ARG_WITH(default-name-mangling, MANGLING=$withval, MANGLING=auto) case "$MANGLING" in auto) mangling=DM_STRING_MANGLING_AUTO;; - disabled) mangling=DM_STRING_MANGLING_NONE;; + none|disabled) mangling=DM_STRING_MANGLING_NONE;; hex) mangling=DM_STRING_MANGLING_HEX;; *) AC_MSG_ERROR([--with-default-name-mangling parameter invalid]);; esac

1 0

master - man: document DM_DEFAULT_NAME_MANGLING_MODE
by Zdenek Kabelac 05 Jun '14

05 Jun '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=93c2614e566c1aaf… Commit: 93c2614e566c1aafae178c34838da21caf8ea16a Parent: 4454a580dfd966d0cd132a2fd7d0cbb0df7e46a6 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 5 17:26:53 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 5 17:47:21 2014 +0200 man: document DM_DEFAULT_NAME_MANGLING_MODE Document DM_DEFAULT_NAME_MANGLING_MODE environmental variable. (its default setting is build time configurable) --- WHATS_NEW_DM | 1 + configure.in | 3 ++- make.tmpl.in | 3 ++- man/Makefile.in | 2 +- man/dmsetup.8.in | 9 ++++++++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 8e221c1..976f927 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.88 - ================================= + Document env var 'DM_DEFAULT_NAME_MANGLING_MODE' in dmsetup man page. Warn user about incorrect use of cookie with 'dmsetup remove --force'. Also recognize 'help'/'?' as reserved sort key name to show help. Export recognized DM_REPORT_FIELD_RESERVED_NAME_{HELP,HELP_ALT} to show help. diff --git a/configure.in b/configure.in index 16e63c0..807ad32 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ ############################################################################### ## Copyright (C) 2000-2004 Sistina Software, Inc. All rights reserved. -## Copyright (C) 2004-2013 Red Hat, Inc. All rights reserved. +## Copyright (C) 2004-2014 Red Hat, Inc. All rights reserved. ## ## This copyrighted material is made available to anyone wishing to use, ## modify, copy, or redistribute it subject to the terms and conditions @@ -1725,6 +1725,7 @@ AC_SUBST(LVM_PATCHLEVEL) AC_SUBST(LVM_PATH) AC_SUBST(LVM_RELEASE) AC_SUBST(LVM_RELEASE_DATE) +AC_SUBST(MANGLING) AC_SUBST(MIRRORS) AC_SUBST(MSGFMT) AC_SUBST(OCF) diff --git a/make.tmpl.in b/make.tmpl.in index cb5b826..5a3694a 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -1,7 +1,7 @@ # @configure_input@ # # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. -# Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved. +# Copyright (C) 2004-2014 Red Hat, Inc. All rights reserved. # # This file is part of LVM2. # @@ -102,6 +102,7 @@ DEFAULT_CACHE_DIR = $(DEFAULT_SYS_DIR)/@DEFAULT_CACHE_SUBDIR@ DEFAULT_PROFILE_DIR = $(DEFAULT_SYS_DIR)/@DEFAULT_PROFILE_SUBDIR@ DEFAULT_LOCK_DIR = @DEFAULT_LOCK_DIR@ DEFAULT_RUN_DIR = @DEFAULT_RUN_DIR@ +DEFAULT_MANGLING = @MANGLING@ # Setup vpath search paths for some suffixes vpath %.c $(srcdir) diff --git a/man/Makefile.in b/man/Makefile.in index 15f0252..5a11ae2 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -99,7 +99,7 @@ $(MAN5) $(MAN7) $(MAN8) $(MAN8DM) $(MAN8CLUSTER): Makefile %: %.in @case "$@" in \ */*) ;; \ - *) echo "Creating $@" ; $(SED) -e "s+#VERSION#+$(LVM_VERSION)+;s+#DEFAULT_SYS_DIR#+$(DEFAULT_SYS_DIR)+;s+#DEFAULT_ARCHIVE_DIR#+$(DEFAULT_ARCHIVE_DIR)+;s+#DEFAULT_BACKUP_DIR#+$(DEFAULT_BACKUP_DIR)+;s+#DEFAULT_PROFILE_DIR#+$(DEFAULT_PROFILE_DIR)+;s+#DEFAULT_CACHE_DIR#+$(DEFAULT_CACHE_DIR)+;s+#DEFAULT_LOCK_DIR#+$(DEFAULT_LOCK_DIR)+;s+#CLVMD_PATH#+@CLVMD_PATH@+;s+#LVM_PATH#+@LVM_PATH@+;s+#DEFAULT_RUN_DIR#+@DEFAULT_RUN_DIR@+;s+#DEFAULT_PID_DIR#+@DEFAULT_PID_DIR@+;s+#SYSTEMD_GENERATOR_DIR#+$(SYSTEMD_GENERATOR_DIR)+;" $< > $@ ;; \ + *) echo "Creating $@" ; $(SED) -e "s+#VERSION#+$(LVM_VERSION)+;s+#DEFAULT_SYS_DIR#+$(DEFAULT_SYS_DIR)+;s+#DEFAULT_ARCHIVE_DIR#+$(DEFAULT_ARCHIVE_DIR)+;s+#DEFAULT_BACKUP_DIR#+$(DEFAULT_BACKUP_DIR)+;s+#DEFAULT_PROFILE_DIR#+$(DEFAULT_PROFILE_DIR)+;s+#DEFAULT_CACHE_DIR#+$(DEFAULT_CACHE_DIR)+;s+#DEFAULT_LOCK_DIR#+$(DEFAULT_LOCK_DIR)+;s+#CLVMD_PATH#+@CLVMD_PATH@+;s+#LVM_PATH#+@LVM_PATH@+;s+#DEFAULT_RUN_DIR#+@DEFAULT_RUN_DIR@+;s+#DEFAULT_PID_DIR#+@DEFAULT_PID_DIR@+;s+#SYSTEMD_GENERATOR_DIR#+$(SYSTEMD_GENERATOR_DIR)+;s+#DEFAULT_MANGLING#+$(DEFAULT_MANGLING)+;" $< > $@ ;; \ esac install_man5: $(MAN5) diff --git a/man/dmsetup.8.in b/man/dmsetup.8.in index 9a738fb..1b17580 100644 --- a/man/dmsetup.8.in +++ b/man/dmsetup.8.in @@ -202,6 +202,9 @@ mangled, error on mixed; this is used by default). Character whitelist: 0-9, A-Z, a-z, #+-.:=@_. This whitelist is also supported by udev. Any character not on a whitelist is replaced with its hex value (two digits) prefixed by \\x. +Mangling mode could be also set through +.B DM_DEFAULT_NAME_MANGLING_MODE +environment variable. .TP .BR \-j | \-\-major\ \fImajor Specify the major number. @@ -712,7 +715,11 @@ Defaults to "/dev" and must be an absolute path. .TP .B DM_UDEV_COOKIE A cookie to use for all relevant commands to synchronize with udev processing. -It is an alternative to using \-\-udevcookie option. +It is an alternative to using \fB\-\-udevcookie\fP option. +.TP +.B DM_DEFAULT_NAME_MANGLING_MODE +A default mangling mode. Defaults to "#DEFAULT_MANGLING#" +and it is an alternative to using \fB\-\-manglename\fP option. .SH AUTHORS Original version: Joe Thornber (thornber(a)redhat.com)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits June 2014