upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebuild

Browse source
This commit is contained in:
Kurt Zeilenga 2007-03-02 20:53:56 +00:00
parent 22b8d8b189
commit e630a6a428
3 changed files with 91 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

138
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.646 2007/03/02 06:36:23 kurt Exp . # From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.647 2007/03/02 19:44:31 kurt Exp .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59. # Generated by GNU Autoconf 2.59.
# #
@ -17396,62 +17396,32 @@ fi
done done
if test $ac_cv_header_uuid_uuid_h = yes ; then if test $ac_cv_header_uuid_uuid_h = yes ; then
save_LIBS="$LIBS"
for ac_func in uuid_generate echo "$as_me:$LINENO: checking for library containing uuid_generate" >&5
do echo $ECHO_N "checking for library containing uuid_generate... $ECHO_C" >&6
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` if test "${ac_cv_search_uuid_generate+set}" = set; then
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
cat >conftest.$ac_ext <<_ACEOF ac_func_search_save_LIBS=$LIBS
ac_cv_search_uuid_generate=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{
#endif #endif
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */ builtin and then its argument prototype would still apply. */
char $ac_func (); char uuid_generate ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
char (*f) () = $ac_func;
#endif
#ifdef __cplusplus
}
#endif
int int
main () main ()
{ {
return f != $ac_func; uuid_generate ();
; ;
return 0; return 0;
} }
@ -17478,27 +17448,95 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
eval "$as_ac_var=yes" ac_cv_search_uuid_generate="none required"
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi fi
rm -f conftest.err conftest.$ac_objext \ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
if test "$ac_cv_search_uuid_generate" = no; then
for ac_lib in uuid; do
LIBS="-l$ac_lib $ac_func_search_save_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 gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char uuid_generate ();
int
main ()
{
uuid_generate ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_search_uuid_generate="-l$ac_lib"
break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 rm -f conftest.err conftest.$ac_objext \
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 conftest$ac_exeext conftest.$ac_ext
if test `eval echo '${'$as_ac_var'}'` = yes; then done
cat >>confdefs.h <<_ACEOF fi
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 LIBS=$ac_func_search_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_search_uuid_generate" >&5
echo "${ECHO_T}$ac_cv_search_uuid_generate" >&6
if test "$ac_cv_search_uuid_generate" != no; then
test "$ac_cv_search_uuid_generate" = "none required" || LIBS="$ac_cv_search_uuid_generate $LIBS"
have_uuid=yes
else
:
fi
LIBS="$save_LIBS"
if test have_uuid = yes ; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_UUID_GENERATE 1
_ACEOF _ACEOF
fi
done
have_uuid=$ac_cv_func_uuid_generate test "$ac_cv_search_uuid_generate" = "none required" || \
SLAPD_LIBS="$SLAPD_LIBS $ac_cv_search_uuid_generate"
fi
fi fi
fi fi

4
configure.in
View file

@ -988,7 +988,7 @@ have_uuid=no
AC_CHECK_HEADERS(sys/uuid.h) AC_CHECK_HEADERS(sys/uuid.h)
if test $ac_cv_header_sys_uuid_h = yes ; then if test $ac_cv_header_sys_uuid_h = yes ; then
save_LIBS="$LIBS" save_LIBS="$LIBS"
AC_SEARCH_LIBS(uuid_to_str, uuid, [have_uuid=yes], :) AC_SEARCH_LIBS([uuid_to_str], [uuid], [have_uuid=yes], :)
LIBS="$save_LIBS" LIBS="$save_LIBS"
if test have_uuid = yes ; then if test have_uuid = yes ; then
@ -1005,7 +1005,7 @@ if test $have_uuid = no ; then
AC_CHECK_HEADERS(uuid/uuid.h) AC_CHECK_HEADERS(uuid/uuid.h)
if test $ac_cv_header_uuid_uuid_h = yes ; then if test $ac_cv_header_uuid_uuid_h = yes ; then
save_LIBS="$LIBS" save_LIBS="$LIBS"
AC_SEARCH_LIBS(uuid_generate, uuid, [have_uuid=yes], :) AC_SEARCH_LIBS([uuid_generate], [uuid], [have_uuid=yes], :)
LIBS="$save_LIBS" LIBS="$save_LIBS"
if test have_uuid = yes ; then if test have_uuid = yes ; then

2
include/portable.hin
View file

@ -729,7 +729,7 @@
/* Define to 1 if you have the <utime.h> header file. */ /* Define to 1 if you have the <utime.h> header file. */
#undef HAVE_UTIME_H #undef HAVE_UTIME_H
/* Define to 1 if you have the `uuid_generate' function. */ /* define if you have uuid_generate() */
#undef HAVE_UUID_GENERATE #undef HAVE_UUID_GENERATE
/* define if you have uuid_to_str() */ /* define if you have uuid_to_str() */