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

autoreconf

Browse Source
This commit is contained in:
Alasdair Kergon 2011-08-09 18:14:48 +00:00
parent 7cf607705b
commit 13db59839c
2 changed files with 3 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

262
configure vendored
View File

@ -669,6 +669,8 @@ CLUSTER
CLDWHOLEARCHIVE
CLDNOWHOLEARCHIVE
CLDFLAGS
CCS_LIBS
CCS_CFLAGS
BUILD_DMEVENTD
BUILD_CMIRRORD
APPLIB
@ -699,10 +701,6 @@ COROSYNC_LIBS
COROSYNC_CFLAGS
CMAN_LIBS
CMAN_CFLAGS
GULM_LIBS
GULM_CFLAGS
CCS_LIBS
CCS_CFLAGS
PKGCONFIGINIT_LIBS
PKGCONFIGINIT_CFLAGS
PKG_CONFIG_LIBDIR
@ -860,10 +858,6 @@ PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
PKGCONFIGINIT_CFLAGS
PKGCONFIGINIT_LIBS
CCS_CFLAGS
CCS_LIBS
GULM_CFLAGS
GULM_LIBS
CMAN_CFLAGS
CMAN_LIBS
COROSYNC_CFLAGS
@ -1553,7 +1547,6 @@ Optional Packages:
[[PREFIX/lib/ocf/resource.d/lvm2]]
--with-clvmd=TYPE build cluster LVM Daemon
The following cluster manager combinations are valid:
* cman,gulm (RHEL4 or equivalent)
* cman (RHEL5 or equivalent)
* cman,corosync,openais (or selection of them)
* singlenode (localhost only)
@ -1610,10 +1603,6 @@ Some influential environment variables:
C compiler flags for PKGCONFIGINIT, overriding pkg-config
PKGCONFIGINIT_LIBS
linker flags for PKGCONFIGINIT, overriding pkg-config
CCS_CFLAGS C compiler flags for CCS, overriding pkg-config
CCS_LIBS linker flags for CCS, overriding pkg-config
GULM_CFLAGS C compiler flags for GULM, overriding pkg-config
GULM_LIBS linker flags for GULM, overriding pkg-config
CMAN_CFLAGS C compiler flags for CMAN, overriding pkg-config
CMAN_LIBS linker flags for CMAN, overriding pkg-config
COROSYNC_CFLAGS
@ -7205,9 +7194,7 @@ CLVMD_CMANAGERS=""
CLVMD_NEEDS_QDISKD=no
if [ `expr x"$CLVMD" : '.*gulm.*'` != 0 ]; then
BUILDGULM=yes
CLVMD_CMANAGERS="$CLVMD_CMANAGERS lock_gulmd"
CLVMD_NEEDS_QDISKD=yes
as_fn_error $? "Since version 2.02.87 GULM locking is no longer supported." "$LINENO" 5;
fi
if [ `expr x"$CLVMD" : '.*cman.*'` != 0 ]; then
BUILDCMAN=yes
@ -7226,13 +7213,6 @@ if test x$CLVMD_NEEDS_QDISKD != xno; then
CLVMD_CMANAGERS="$CLVMD_CMANAGERS qdiskd"
fi
if test x$BUILDGULM = xyes; then
if test x$BUILDCOROSYNC = xyes || \
test x$BUILDOPENAIS = xyes; then
as_fn_error $? "requested clvmd configuration is not valid" "$LINENO" 5
fi
fi
soft_bailout() {
NOTFOUND=1
}
@ -7243,7 +7223,6 @@ hard_bailout() {
if test x$CLVMD = xall; then
bailout=soft_bailout
BUILDGULM=yes
BUILDCMAN=yes
BUILDCOROSYNC=yes
BUILDOPENAIS=yes
@ -7309,231 +7288,6 @@ fi
LIBS=$ac_check_lib_save_LIBS
}
if test x$BUILDGULM = xyes; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CCS" >&5
$as_echo_n "checking for CCS... " >&6; }
if test -n "$CCS_CFLAGS"; then
pkg_cv_CCS_CFLAGS="$CCS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libccs\""; } >&5
($PKG_CONFIG --exists --print-errors "libccs") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_CCS_CFLAGS=`$PKG_CONFIG --cflags "libccs" 2>/dev/null`
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$CCS_LIBS"; then
pkg_cv_CCS_LIBS="$CCS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libccs\""; } >&5
($PKG_CONFIG --exists --print-errors "libccs") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_CCS_LIBS=`$PKG_CONFIG --libs "libccs" 2>/dev/null`
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
CCS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libccs" 2>&1`
else
CCS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libccs" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$CCS_PKG_ERRORS" >&5
NOTFOUND=0
for ac_header in ccs.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "ccs.h" "ac_cv_header_ccs_h" "$ac_includes_default"
if test "x$ac_cv_header_ccs_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_CCS_H 1
_ACEOF
else
$bailout
fi
done
check_lib_no_libs ccs ccs_connect
if test $NOTFOUND = 0; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no pkg for libccs, using -lccs" >&5
$as_echo "no pkg for libccs, using -lccs" >&6; }
CCS_LIBS="-lccs"
HAVE_CCS=yes
fi
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
NOTFOUND=0
for ac_header in ccs.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "ccs.h" "ac_cv_header_ccs_h" "$ac_includes_default"
if test "x$ac_cv_header_ccs_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_CCS_H 1
_ACEOF
else
$bailout
fi
done
check_lib_no_libs ccs ccs_connect
if test $NOTFOUND = 0; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no pkg for libccs, using -lccs" >&5
$as_echo "no pkg for libccs, using -lccs" >&6; }
CCS_LIBS="-lccs"
HAVE_CCS=yes
fi
else
CCS_CFLAGS=$pkg_cv_CCS_CFLAGS
CCS_LIBS=$pkg_cv_CCS_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
HAVE_CCS=yes
fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GULM" >&5
$as_echo_n "checking for GULM... " >&6; }
if test -n "$GULM_CFLAGS"; then
pkg_cv_GULM_CFLAGS="$GULM_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgulm\""; } >&5
($PKG_CONFIG --exists --print-errors "libgulm") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GULM_CFLAGS=`$PKG_CONFIG --cflags "libgulm" 2>/dev/null`
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$GULM_LIBS"; then
pkg_cv_GULM_LIBS="$GULM_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgulm\""; } >&5
($PKG_CONFIG --exists --print-errors "libgulm") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GULM_LIBS=`$PKG_CONFIG --libs "libgulm" 2>/dev/null`
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
GULM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgulm" 2>&1`
else
GULM_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgulm" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GULM_PKG_ERRORS" >&5
NOTFOUND=0
for ac_header in libgulm.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "libgulm.h" "ac_cv_header_libgulm_h" "$ac_includes_default"
if test "x$ac_cv_header_libgulm_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGULM_H 1
_ACEOF
else
$bailout
fi
done
check_lib_no_libs gulm lg_core_login
if test $NOTFOUND = 0; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no pkg for libgulm, using -lgulm" >&5
$as_echo "no pkg for libgulm, using -lgulm" >&6; }
GULM_LIBS="-lgulm"
HAVE_GULM=yes
fi
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
NOTFOUND=0
for ac_header in libgulm.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "libgulm.h" "ac_cv_header_libgulm_h" "$ac_includes_default"
if test "x$ac_cv_header_libgulm_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGULM_H 1
_ACEOF
else
$bailout
fi
done
check_lib_no_libs gulm lg_core_login
if test $NOTFOUND = 0; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no pkg for libgulm, using -lgulm" >&5
$as_echo "no pkg for libgulm, using -lgulm" >&6; }
GULM_LIBS="-lgulm"
HAVE_GULM=yes
fi
else
GULM_CFLAGS=$pkg_cv_GULM_CFLAGS
GULM_LIBS=$pkg_cv_GULM_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
HAVE_GULM=yes
fi
fi
if test x$BUILDCMAN = xyes; then
pkg_failed=no
@ -8165,14 +7919,6 @@ if test x$CLVMD = xall; then
CLVMD=none
CLVMD_CMANAGERS=""
CLVMD_NEEDS_QDISKD=no
if test x$HAVE_CCS = xyes && \
test x$HAVE_GULM = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling clvmd gulm cluster manager" >&5
$as_echo "Enabling clvmd gulm cluster manager" >&6; }
CLVMD="$CLVMD,gulm"
CLVMD_CMANAGERS="$CLVMD_CMANAGERS lock_gulmd"
CLVMD_NEEDS_QDISKD=yes
fi
if test x$HAVE_CMAN = xyes && \
test x$HAVE_DLM = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling clvmd cman cluster manager" >&5
@ -10415,8 +10161,6 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`

6
lib/misc/configure.h.in
View File

@ -84,9 +84,6 @@
/* Define to 1 if canonicalize_file_name is available. */
#undef HAVE_CANONICALIZE_FILE_NAME
/* Define to 1 if you have the <ccs.h> header file. */
#undef HAVE_CCS_H
/* Define to 1 if your system has a working `chown' function. */
#undef HAVE_CHOWN
@ -159,9 +156,6 @@
/* Define to 1 if you have the <libgen.h> header file. */
#undef HAVE_LIBGEN_H
/* Define to 1 if you have the <libgulm.h> header file. */
#undef HAVE_LIBGULM_H
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H