ITS#6082 return checker module's error message to client

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index b33426b99581bea6bb8702ccd29969da3974be09..bde0b0ba4a7a750a5b7c0dfb66be86a4f509da44 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl $OpenLDAP$
 dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
 dnl
 dnl $OpenLDAP$
 dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
 dnl

-dnl Copyright 1998-2008 The OpenLDAP Foundation.
+dnl Copyright 1998-2009 The OpenLDAP Foundation.

 dnl All rights reserved.
 dnl
 dnl Redistribution and use in source and binary forms, with or without
 dnl All rights reserved.
 dnl
 dnl Redistribution and use in source and binary forms, with or without


@@ -23,7 +23,7 @@ define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
 define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl
 dnl ================================================================
 dnl Configure.in for OpenLDAP
 define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl
 dnl ================================================================
 dnl Configure.in for OpenLDAP

-AC_COPYRIGHT([[Copyright 1998-2008 The OpenLDAP Foundation. All rights reserved.
+AC_COPYRIGHT([[Copyright 1998-2009 The OpenLDAP Foundation. All rights reserved.

 Restrictions apply, see COPYRIGHT and LICENSE files.]])
 AC_REVISION([$OpenLDAP$])
 AC_INIT([OpenLDAP],,[http://www.openldap.org/its/])
 Restrictions apply, see COPYRIGHT and LICENSE files.]])
 AC_REVISION([$OpenLDAP$])
 AC_INIT([OpenLDAP],,[http://www.openldap.org/its/])


@@ -96,7 +96,7 @@ AH_TOP([
 /* begin of portable.h.pre */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
 /* begin of portable.h.pre */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *

- * Copyright 1998-2008 The OpenLDAP Foundation
+ * Copyright 1998-2009 The OpenLDAP Foundation

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -698,6 +698,7 @@ dnl Checks for Windows NT
 case $host_os in
   *mingw32* ) ac_cv_mingw32=yes ;;
   *cygwin* ) ac_cv_cygwin=yes ;;
 case $host_os in
   *mingw32* ) ac_cv_mingw32=yes ;;
   *cygwin* ) ac_cv_cygwin=yes ;;

+  *interix* ) ac_cv_interix=yes ;;

 esac
 
 dnl ----------------------------------------------------------------
 esac
 
 dnl ----------------------------------------------------------------


@@ -843,7 +844,10 @@ AC_CHECK_HEADERS(  \
 )
 
 dnl Only check Winsock on MinGW
 )
 
 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
 
        AC_CHECK_HEADERS( winsock.h winsock2.h )
 fi
 


@@ -875,7 +879,7 @@ if test $ac_cv_func_sigaction = no && test $ac_cv_func_sigaction = no ; then
        AC_CHECK_LIB(V3, sigset)
 fi
 
        AC_CHECK_LIB(V3, sigset)
 fi
 

-if test $ol_cv_msvc ; then
+if test $ol_cv_msvc = yes ; then

    ol_cv_winsock=yes
 fi
 
    ol_cv_winsock=yes
 fi
 


@@ -886,7 +890,7 @@ if test "$ac_cv_header_winsock_h" = yes; then
        AC_CACHE_CHECK([for winsock], [ol_cv_winsock],[
        save_LIBS="$LIBS"
        for curlib in none ws2_32 wsock32; do
        AC_CACHE_CHECK([for winsock], [ol_cv_winsock],[
        save_LIBS="$LIBS"
        for curlib in none ws2_32 wsock32; do

-               if test curlib != none ; then
+               if test $curlib != none ; then

                LIBS="$save_LIBS -l$curlib"
                fi
                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>
                LIBS="$save_LIBS -l$curlib"
                fi
                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>


@@ -1008,9 +1012,11 @@ dnl UUID Support
 
 have_uuid=no
 AC_CHECK_HEADERS(sys/uuid.h)
 
 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], :)
 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
        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
 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], :)
 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
                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
                                     [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
 
        ;;
        fi
 
        ;;


@@ -3208,7 +3221,7 @@ rm -f $BACKENDSC
 cat > $BACKENDSC << ENDX
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
 cat > $BACKENDSC << ENDX
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *

- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -3259,7 +3272,7 @@ rm -f $OVERLAYSC
 cat > $OVERLAYSC << ENDX
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
 cat > $OVERLAYSC << ENDX
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *

- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without