diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2010-06-07 14:31:59 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2010-06-07 14:31:59 +0000 |
| commit | a9b601e2be266cd88feb05a74ad72be7f3f5f7a3 (patch) | |
| tree | 338c47542f00babd9aaad8b42bb66621d6e94a84 /configure.in | |
| parent | 4c10ab562769a0339096a4d9712b4a6e11886678 (diff) | |
| download | lvm2-a9b601e2be266cd88feb05a74ad72be7f3f5f7a3.tar.gz lvm2-a9b601e2be266cd88feb05a74ad72be7f3f5f7a3.tar.xz lvm2-a9b601e2be266cd88feb05a74ad72be7f3f5f7a3.zip | |
Fix wrong usage of exec_prefix from previous patch introducing LVM_PATH define
Introduce lvm_exec_prefix with resolved exec_prefix.
(using same ac_default_prefix as for CLVMD_PATH)
Use lvm_exec_prefix instead of dmeventd_prefix (fixes missing ac_default_prefix)
Note: This patch is rather hot-fix as currently generate code
does not create correct code for make exec_prefix=
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/configure.in b/configure.in index aeee3858..c12ed709 100644 --- a/configure.in +++ b/configure.in @@ -1009,7 +1009,11 @@ if test x$MODPROBE_CMD != x; then AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) fi -AC_DEFINE_UNQUOTED(LVM_PATH, ["$exec_prefix/sbin/lvm"], [Path to lvm binary.]) + +lvm_exec_prefix=$exec_prefix +test "$lvm_exec_prefix" = NONE && lvm_exec_prefix=$prefix +test "$lvm_exec_prefix" = NONE && lvm_exec_prefix=$ac_default_prefix +AC_DEFINE_UNQUOTED(LVM_PATH, ["$lvm_exec_prefix/sbin/lvm"], [Path to lvm binary.]) if test "$CLVMD" != none; then clvmd_prefix=$ac_default_prefix @@ -1029,17 +1033,10 @@ fi AH_TEMPLATE(DMEVENTD_PATH, [Path to dmeventd binary.]) if test "$BUILD_DMEVENTD" = yes; then - dmeventd_prefix="$exec_prefix" - if test "x$dmeventd_prefix" = "xNONE"; then - dmeventd_prefix="$prefix" - fi - if test "x$dmeventd_prefix" = "xNONE"; then - dmeventd_prefix="" - fi AC_ARG_WITH(dmeventd-path, [ --with-dmeventd-path=PATH dmeventd path [[EPREFIX/sbin/dmeventd]] ], [ AC_DEFINE_UNQUOTED(DMEVENTD_PATH,"$withval") ], - [ AC_DEFINE_UNQUOTED(DMEVENTD_PATH,"$dmeventd_prefix/sbin/dmeventd") ]) + [ AC_DEFINE_UNQUOTED(DMEVENTD_PATH,"$lvm_exec_prefix/sbin/dmeventd") ]) fi ################################################################################ |