ITS#6036 zero out freed val

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index fc5a2ed1c8a89084f35797e84a8528cf84084d60..80975b82649e3e326a54555c4d49c9d044b96c1f 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


@@ -665,8 +665,6 @@ AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 

-OL_MSVC
-

 dnl ----------------------------------------------------------------
 dnl Perl
 ol_link_perl=no
 dnl ----------------------------------------------------------------
 dnl Perl
 ol_link_perl=no


@@ -693,12 +691,14 @@ if test $ol_enable_perl != no ; then
 fi
 
 AC_PROG_CPP
 fi
 
 AC_PROG_CPP

+OL_MSVC

 
 dnl ----------------------------------------------------------------
 dnl Checks for Windows NT
 case $host_os in
   *mingw32* ) ac_cv_mingw32=yes ;;
   *cygwin* ) ac_cv_cygwin=yes ;;
 
 dnl ----------------------------------------------------------------
 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 ----------------------------------------------------------------
 esac
 
 dnl ----------------------------------------------------------------


@@ -844,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
 


@@ -876,17 +879,21 @@ 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
+   ol_cv_winsock=yes
+fi
+

 dnl The following is INTENTIONALLY scripted out because shell does not
 dnl support variable names with the '@' character, which is what
 dnl autoconf would try to generate if one merely used AC_SEARCH_LIBS
 if test "$ac_cv_header_winsock_h" = yes; then
 dnl The following is INTENTIONALLY scripted out because shell does not
 dnl support variable names with the '@' character, which is what
 dnl autoconf would try to generate if one merely used AC_SEARCH_LIBS
 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
-       if test curlib != none ; then
-           LIBS="$save_LIBS -l$curlib"
-       fi
-       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>
+       AC_CACHE_CHECK([for winsock], [ol_cv_winsock],[
+       save_LIBS="$LIBS"
+       for curlib in none ws2_32 wsock32; do
+               if test curlib != none ; then
+               LIBS="$save_LIBS -l$curlib"
+               fi
+               AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>

                        ]], [[
                        socket(0,0,0);
                        select(0,NULL,NULL,NULL,NULL);
                        ]], [[
                        socket(0,0,0);
                        select(0,NULL,NULL,NULL,NULL);


@@ -894,24 +901,26 @@ for curlib in none ws2_32 wsock32; do
                        gethostname(NULL,0);
                        ]])],[ol_cv_winsock=$curlib],[ol_cv_winsock=no])
 
                        gethostname(NULL,0);
                        ]])],[ol_cv_winsock=$curlib],[ol_cv_winsock=no])
 

-       test $ol_cv_winsock != no && break;
-done
-LIBS="$save_LIBS"
-])
-if test $ol_cv_winsock != no ; then
-    AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])
-    ac_cv_func_socket=yes
-    ac_cv_func_select=yes
-    ac_cv_func_closesocket=yes
-    ac_cv_func_gethostname=yes
+               test "$ol_cv_winsock" != no && break
+       done
+       LIBS="$save_LIBS"
+       ])

 
 

-       if test $ol_cv_winsock != none ; then
-        LIBS="$LIBS -l$ol_cv_winsock"
-       fi
+       if test $ol_cv_winsock != no ; then
+       AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])
+       ac_cv_func_socket=yes
+       ac_cv_func_select=yes
+       ac_cv_func_closesocket=yes
+       ac_cv_func_gethostname=yes
+
+               if test $ol_cv_winsock != none -a $ol_cv_winsock != yes ; then
+               LIBS="$LIBS -l$ol_cv_winsock"
+               fi

 
 

-    if test $ol_cv_winsock = ws2_32 ; then
-               AC_DEFINE(HAVE_WINSOCK2, 1, [define if you have winsock2])
-    fi
+       if test $ol_cv_winsock = ws2_32 -o $ol_cv_winsock = yes ; then
+                       AC_DEFINE(HAVE_WINSOCK2, 1, [define if you have winsock2])
+       fi
+       fi

 fi
 
 dnl Find socket()
 fi
 
 dnl Find socket()


@@ -976,7 +985,6 @@ then
 fi
 
 dnl ----------------------------------------------------------------
 fi
 
 dnl ----------------------------------------------------------------

-# strerror checks

 OL_STRERROR
 
 dnl ----------------------------------------------------------------
 OL_STRERROR
 
 dnl ----------------------------------------------------------------


@@ -1004,12 +1012,14 @@ 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"
 
        LIBS="$save_LIBS"
 

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

                AC_DEFINE(HAVE_UUID_TO_STR,1,
                        [define if you have uuid_to_str()])
 
                AC_DEFINE(HAVE_UUID_TO_STR,1,
                        [define if you have uuid_to_str()])
 


@@ -1019,14 +1029,16 @@ 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"
 
                LIBS="$save_LIBS"
 

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

                        AC_DEFINE(HAVE_UUID_GENERATE,1,
                                [define if you have uuid_generate()])
 
                        AC_DEFINE(HAVE_UUID_GENERATE,1,
                                [define if you have uuid_generate()])
 


@@ -1169,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
 
        ;;


@@ -3047,7 +3064,7 @@ dnl For Windows build, we don't want to include -dlopen flags.
 dnl They hurt more than they help.
 dnl
 
 dnl They hurt more than they help.
 dnl
 

-if test "$ac_cv_mingw32" = yes ; then
+if test "$ac_cv_mingw32" = yes -o $ol_cv_msvc = yes ; then

        PLAT=NT
        SLAPD_MODULES_LDFLAGS=
 else
        PLAT=NT
        SLAPD_MODULES_LDFLAGS=
 else


@@ -3204,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


@@ -3255,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