Do not require ac/string.h for lber_pvt.h

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index 46e5e8cc8f0216bd3fa077597f237c3dbabd3a75..60c446096383f3cc7459a1e861ae9397a2d3fecf 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-2017 The OpenLDAP Foundation.
+dnl Copyright 1998-2018 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-2017 The OpenLDAP Foundation. All rights reserved.
+AC_COPYRIGHT([[Copyright 1998-2018 The OpenLDAP Foundation. All rights reserved.

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


@@ -98,7 +98,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-2017 The OpenLDAP Foundation
+ * Copyright 1998-2018 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


@@ -610,6 +610,7 @@ KRB4_LIBS=
 KRB5_LIBS=
 SASL_LIBS=
 TLS_LIBS=
 KRB5_LIBS=
 SASL_LIBS=
 TLS_LIBS=

+WITH_TLS_TYPE=

 MODULES_LIBS=
 SLAPI_LIBS=
 LIBSLAPI=
 MODULES_LIBS=
 SLAPI_LIBS=
 LIBSLAPI=


@@ -1210,6 +1211,7 @@ if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then
                if test $have_openssl = yes ; then
                        ol_with_tls=openssl
                        ol_link_tls=yes
                if test $have_openssl = yes ; then
                        ol_with_tls=openssl
                        ol_link_tls=yes

+                       WITH_TLS_TYPE=openssl

 
                        AC_DEFINE(HAVE_OPENSSL, 1, 
                                [define if you have OpenSSL])
 
                        AC_DEFINE(HAVE_OPENSSL, 1, 
                                [define if you have OpenSSL])


@@ -1250,6 +1252,7 @@ if test $ol_link_tls = no ; then
                        if test $have_gnutls = yes ; then
                                ol_with_tls=gnutls
                                ol_link_tls=yes
                        if test $have_gnutls = yes ; then
                                ol_with_tls=gnutls
                                ol_link_tls=yes

+                               WITH_TLS_TYPE=gnutls

 
                                TLS_LIBS="-lgnutls"
 
 
                                TLS_LIBS="-lgnutls"
 


@@ -3261,6 +3264,7 @@ AC_SUBST(KRB4_LIBS)
 AC_SUBST(KRB5_LIBS)
 AC_SUBST(SASL_LIBS)
 AC_SUBST(TLS_LIBS)
 AC_SUBST(KRB5_LIBS)
 AC_SUBST(SASL_LIBS)
 AC_SUBST(TLS_LIBS)

+AC_SUBST(WITH_TLS_TYPE)

 AC_SUBST(MODULES_LIBS)
 AC_SUBST(SLAPI_LIBS)
 AC_SUBST(LIBSLAPI)
 AC_SUBST(MODULES_LIBS)
 AC_SUBST(SLAPI_LIBS)
 AC_SUBST(LIBSLAPI)


@@ -3339,7 +3343,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-2017 The OpenLDAP Foundation.
+ * Copyright 1998-2018 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


@@ -3390,7 +3394,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-2017 The OpenLDAP Foundation.
+ * Copyright 1998-2018 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