mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
ITS#5905
This commit is contained in:
parent
c0586f0f45
commit
cf8547c5bd
170
configure
vendored
170
configure
vendored
@ -17868,6 +17868,91 @@ else
|
||||
:
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for library containing uuid_create" >&5
|
||||
echo $ECHO_N "checking for library containing uuid_create... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_search_uuid_create+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&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 uuid_create ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return uuid_create ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
for ac_lib in '' uuid; 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 "echo \"\$as_me:$LINENO: $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
|
||||
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 &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
ac_cv_search_uuid_create=$ac_res
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext
|
||||
if test "${ac_cv_search_uuid_create+set}" = set; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test "${ac_cv_search_uuid_create+set}" = set; then
|
||||
:
|
||||
else
|
||||
ac_cv_search_uuid_create=no
|
||||
fi
|
||||
rm conftest.$ac_ext
|
||||
LIBS=$ac_func_search_save_LIBS
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_search_uuid_create" >&5
|
||||
echo "${ECHO_T}$ac_cv_search_uuid_create" >&6; }
|
||||
ac_res=$ac_cv_search_uuid_create
|
||||
if test "$ac_res" != no; then
|
||||
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
||||
:
|
||||
else
|
||||
have_uuid=no
|
||||
fi
|
||||
|
||||
LIBS="$save_LIBS"
|
||||
|
||||
if test $have_uuid = yes ; then
|
||||
@ -18115,6 +18200,91 @@ else
|
||||
:
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for library containing uuid_unparse_lower" >&5
|
||||
echo $ECHO_N "checking for library containing uuid_unparse_lower... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_search_uuid_unparse_lower+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&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 uuid_unparse_lower ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return uuid_unparse_lower ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
for ac_lib in '' uuid; 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 "echo \"\$as_me:$LINENO: $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
|
||||
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 &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
ac_cv_search_uuid_unparse_lower=$ac_res
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext
|
||||
if test "${ac_cv_search_uuid_unparse_lower+set}" = set; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test "${ac_cv_search_uuid_unparse_lower+set}" = set; then
|
||||
:
|
||||
else
|
||||
ac_cv_search_uuid_unparse_lower=no
|
||||
fi
|
||||
rm conftest.$ac_ext
|
||||
LIBS=$ac_func_search_save_LIBS
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_search_uuid_unparse_lower" >&5
|
||||
echo "${ECHO_T}$ac_cv_search_uuid_unparse_lower" >&6; }
|
||||
ac_res=$ac_cv_search_uuid_unparse_lower
|
||||
if test "$ac_res" != no; then
|
||||
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
||||
:
|
||||
else
|
||||
have_uuid=no
|
||||
fi
|
||||
|
||||
LIBS="$save_LIBS"
|
||||
|
||||
if test $have_uuid = yes ; then
|
||||
|
@ -1012,9 +1012,11 @@ dnl UUID Support
|
||||
|
||||
have_uuid=no
|
||||
AC_CHECK_HEADERS(sys/uuid.h)
|
||||
dnl The HAVE_UUID_TO_STR code path also needs uuid_create
|
||||
if test $ac_cv_header_sys_uuid_h = yes ; then
|
||||
save_LIBS="$LIBS"
|
||||
AC_SEARCH_LIBS([uuid_to_str], [uuid], [have_uuid=yes], :)
|
||||
AC_SEARCH_LIBS([uuid_create], [uuid], :, [have_uuid=no])
|
||||
LIBS="$save_LIBS"
|
||||
|
||||
if test $have_uuid = yes ; then
|
||||
@ -1027,11 +1029,13 @@ if test $ac_cv_header_sys_uuid_h = yes ; then
|
||||
fi
|
||||
|
||||
dnl Look for uuid_generate
|
||||
dnl The HAVE_UUID_GENERATE code path also needs uuid_unparse_lower
|
||||
if test $have_uuid = no ; then
|
||||
AC_CHECK_HEADERS(uuid/uuid.h)
|
||||
if test $ac_cv_header_uuid_uuid_h = yes ; then
|
||||
save_LIBS="$LIBS"
|
||||
AC_SEARCH_LIBS([uuid_generate], [uuid], [have_uuid=yes], :)
|
||||
AC_SEARCH_LIBS([uuid_unparse_lower], [uuid], :, [have_uuid=no])
|
||||
LIBS="$save_LIBS"
|
||||
|
||||
if test $have_uuid = yes ; then
|
||||
|
Loading…
Reference in New Issue
Block a user