===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/configure,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/usr.bin/sudo/Attic/configure	2008/01/07 14:10:08	1.34
--- src/usr.bin/sudo/Attic/configure	2008/01/21 19:44:29	1.35
***************
*** 22473,22485 ****
        conftest$ac_exeext conftest.$ac_ext
      done
          if test "$found" = "no"; then
! 	LDAP_LIBS=" -lldap"
  	{ echo "$as_me:$LINENO: result: not found, using -lldap" >&5
  echo "${ECHO_T}not found, using -lldap" >&6; }
      else
  	{ echo "$as_me:$LINENO: result: $LDAP_LIBS" >&5
  echo "${ECHO_T}$LDAP_LIBS" >&6; }
      fi
          { echo "$as_me:$LINENO: checking whether lber.h is needed" >&5
  echo $ECHO_N "checking whether lber.h is needed... $ECHO_C" >&6; }
      cat >conftest.$ac_ext <<_ACEOF
--- 22473,22575 ----
        conftest$ac_exeext conftest.$ac_ext
      done
          if test "$found" = "no"; then
! 	LIBS="${_LIBS} -lldap"
! 	LDAP_LIBS="-lldap"
  	{ echo "$as_me:$LINENO: result: not found, using -lldap" >&5
  echo "${ECHO_T}not found, using -lldap" >&6; }
      else
  	{ echo "$as_me:$LINENO: result: $LDAP_LIBS" >&5
  echo "${ECHO_T}$LDAP_LIBS" >&6; }
      fi
+         OLIBS="$LIBS"
+     { echo "$as_me:$LINENO: checking for library containing ber_set_option" >&5
+ echo $ECHO_N "checking for library containing ber_set_option... $ECHO_C" >&6; }
+ if test "${ac_cv_search_ber_set_option+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_func_search_save_LIBS=$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 GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char ber_set_option ();
+ int
+ main ()
+ {
+ return ber_set_option ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ for ac_lib in '' lber; do
+   if test -z "$ac_lib"; then
+     ac_res="none required"
+   else
+     ac_res=-l$ac_lib
+     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+   fi
+   rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+   ac_cv_search_ber_set_option=$ac_res
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_ber_set_option+set}" = set; then
+   break
+ fi
+ done
+ if test "${ac_cv_search_ber_set_option+set}" = set; then
+   :
+ else
+   ac_cv_search_ber_set_option=no
+ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_search_ber_set_option" >&5
+ echo "${ECHO_T}$ac_cv_search_ber_set_option" >&6; }
+ ac_res=$ac_cv_search_ber_set_option
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+   found=yes
+ else
+   found=no
+ fi
+ 
+     if test X"$found" = X"yes" -a X"$LIBS" != X"$OLIBS"; then
+ 	LDAP_LIBS="$LDAP_LIBS -llber"
+     fi
          { echo "$as_me:$LINENO: checking whether lber.h is needed" >&5
  echo $ECHO_N "checking whether lber.h is needed... $ECHO_C" >&6; }
      cat >conftest.$ac_ext <<_ACEOF
***************
*** 22537,22543 ****
  
  
  
! for ac_func in ldap_initialize ldap_start_tls_s ldapssl_init
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  { echo "$as_me:$LINENO: checking for $ac_func" >&5
--- 22627,22634 ----
  
  
  
! 
! for ac_func in ldap_initialize ldap_start_tls_s ldapssl_init ldapssl_set_strength
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  { echo "$as_me:$LINENO: checking for $ac_func" >&5
***************
*** 22628,22633 ****
--- 22719,22783 ----
  _ACEOF
  
  fi
+ done
+ 
+ 
+ 
+ for ac_header in ldap_ssl.h mps/ldap_ssl.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <ldap.h>
+ 
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 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); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   eval "$as_ac_Header=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	eval "$as_ac_Header=no"
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_Header'}'`
+ 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+  break
+ fi
+ 
  done