ITS#6016

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index ba9cc8a36d892e26a9bb266501f35e6f353bd6b2..1aa8e67e2c4a6ff3a571d396d9f3fc9627ccabc3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -698,6 +698,7 @@ dnl Checks for Windows NT
 case $host_os in
   *mingw32* ) ac_cv_mingw32=yes ;;
   *cygwin* ) ac_cv_cygwin=yes ;;
+  *interix* ) ac_cv_interix=yes ;;
 esac
 
 dnl ----------------------------------------------------------------
@@ -843,7 +844,10 @@ AC_CHECK_HEADERS(  \
 )
 
 dnl Only check Winsock on MinGW
-if test "$ac_cv_mingw32" = yes -o "$ol_cv_msvc" = yes ; then
+if test "$ac_cv_mingw32" = yes \
+       -o "$ac_cv_interix" = yes \
+       -o "$ol_cv_msvc" = yes
+then
        AC_CHECK_HEADERS( winsock.h winsock2.h )
 fi
 
@@ -1008,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
@@ -1023,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
@@ -1173,6 +1181,11 @@ case $ol_with_gssapi in yes | auto)
                                     [ol_link_gssapi=yes;GSSAPI_LIBS="-lgssapi_krb5"],
                                     [ol_link_gssapi=no])
                fi
+               if test $ol_link_gssapi != yes ; then
+                       AC_CHECK_LIB(gss, gss_wrap,
+                                    [ol_link_gssapi=yes;GSSAPI_LIBS="-lgss"],
+                                    [ol_link_gssapi=no])
+               fi
        fi
 
        ;;