shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

Fix wrong usage of exec_prefix from previous patch introducing LVM_PATH define

Browse Source 
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=
This commit is contained in:
Zdenek Kabelac 2010-06-07 14:31:59 +00:00
parent 4c10ab5627
commit a9b601e2be
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -15518,8 +15518,12 @@ _ACEOF
fi fi
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
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define LVM_PATH "$exec_prefix/sbin/lvm" #define LVM_PATH "$lvm_exec_prefix/sbin/lvm"
_ACEOF _ACEOF
@ -15556,13 +15560,6 @@ fi
if test "$BUILD_DMEVENTD" = yes; then 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
# Check whether --with-dmeventd-path was given. # Check whether --with-dmeventd-path was given.
if test "${with_dmeventd_path+set}" = set; then if test "${with_dmeventd_path+set}" = set; then
@ -15572,7 +15569,7 @@ _ACEOF
else else
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define DMEVENTD_PATH "$dmeventd_prefix/sbin/dmeventd" #define DMEVENTD_PATH "$lvm_exec_prefix/sbin/dmeventd"
_ACEOF _ACEOF
fi fi

15
configure.in
View File

@ -1009,7 +1009,11 @@ if test x$MODPROBE_CMD != x; then
AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.])
fi 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 if test "$CLVMD" != none; then
clvmd_prefix=$ac_default_prefix clvmd_prefix=$ac_default_prefix
@ -1029,17 +1033,10 @@ fi
AH_TEMPLATE(DMEVENTD_PATH, [Path to dmeventd binary.]) AH_TEMPLATE(DMEVENTD_PATH, [Path to dmeventd binary.])
if test "$BUILD_DMEVENTD" = yes; then 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, AC_ARG_WITH(dmeventd-path,
[ --with-dmeventd-path=PATH dmeventd path [[EPREFIX/sbin/dmeventd]] ], [ --with-dmeventd-path=PATH dmeventd path [[EPREFIX/sbin/dmeventd]] ],
[ AC_DEFINE_UNQUOTED(DMEVENTD_PATH,"$withval") ], [ 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 fi
################################################################################ ################################################################################