From af1144cac0e2e80cb0d69b8e0cce8478b00f5909 Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Tue, 9 Nov 2010 11:14:06 +0000 Subject: [PATCH] forgotten to regenerate last time configure.in was updated --- configure | 112 +++++++++--------------------------------------------- 1 file changed, 19 insertions(+), 93 deletions(-) diff --git a/configure b/configure index 36ec1f32e..9323a579d 100755 --- a/configure +++ b/configure @@ -662,6 +662,7 @@ PTHREAD_LIBS POOL PKGCONFIG REPLICATORS +OCF MIRRORS LVM_RELEASE_DATE LVM_RELEASE @@ -835,6 +836,7 @@ with_mirrors with_replicators enable_readline enable_realtime +enable_ocf with_clvmd with_clvmd_pidfile enable_cmirrord @@ -1539,6 +1541,8 @@ Optional Features: device-mapper is missing from the kernel --disable-readline disable readline support --enable-realtime enable realtime clock support + --enable-ocf enable Open Cluster Framework (OCF) compliant + resource agents --enable-cmirrord enable the cluster mirror log daemon --enable-debug enable debugging --enable-profiling gather gcov profiling data @@ -7892,96 +7896,8 @@ fi ################################################################################ -{ $as_echo "$as_me:$LINENO: checking for library containing floor" >&5 -$as_echo_n "checking for library containing floor... " >&6; } -if test "${ac_cv_search_floor+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char floor (); -int -main () -{ -return floor (); - ; - return 0; -} -_ACEOF -for ac_lib in '' m; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_search_floor=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_floor+set}" = set; then - break -fi -done -if test "${ac_cv_search_floor+set}" = set; then - : -else - ac_cv_search_floor=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_floor" >&5 -$as_echo "$ac_cv_search_floor" >&6; } -ac_res=$ac_cv_search_floor -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else - { { $as_echo "$as_me:$LINENO: error: bailing out" >&5 -$as_echo "$as_me: error: bailing out" >&2;} - { (exit 1); exit 1; }; } -fi @@ -8004,11 +7920,7 @@ fi - - - - -for ac_func in floor ftruncate gethostname getpagesize \ +for ac_func in ftruncate gethostname getpagesize \ gettimeofday memset mkdir mkfifo rmdir munmap nl_langinfo setenv setlocale \ strcasecmp strchr strcspn strspn strdup strncasecmp strerror strrchr \ strstr strtol strtoul uname @@ -11422,6 +11334,19 @@ fi { $as_echo "$as_me:$LINENO: result: $REALTIME" >&5 $as_echo "$REALTIME" >&6; } +################################################################################ +{ $as_echo "$as_me:$LINENO: checking whether to enable OCF resource agents" >&5 +$as_echo_n "checking whether to enable OCF resource agents... " >&6; } +# Check whether --enable-ocf was given. +if test "${enable_ocf+set}" = set; then + enableval=$enable_ocf; OCF=$enableval +else + OCF=no +fi + +{ $as_echo "$as_me:$LINENO: result: $OCF" >&5 +$as_echo "$OCF" >&6; } + ################################################################################ pkg_config_init() { @@ -18262,6 +18187,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'` + ################################################################################ -- 2.43.5