Commit 00505c92 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

moved the RAND_status() and RAND_screen() checks to the openssl section 

added strlcpy() check in the krb4 section
parent 60ee571b

configure.in

+90 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ dnl $Id$ 
dnl Process this file with autoconf to produce a configure script.

AC_INIT(lib/urldata.h)

AM_CONFIG_HEADER(config.h src/config.h)

AM_INIT_AUTOMAKE(curl,"7.2")

AM_INIT_AUTOMAKE(curl,"7.3-pre8")

AM_PROG_LIBTOOL



dnl
@@ -72,6 +72,88 @@ AC_CHECK_FUNC(gethostname, , AC_CHECK_LIB(ucb, gethostname)) 
dnl dl lib?

AC_CHECK_FUNC(dlopen, , AC_CHECK_LIB(dl, dlopen))



dnl **********************************************************************

dnl Check for the presence of Kerberos4 libraries and headers

dnl **********************************************************************



AC_ARG_WITH(krb4-includes,

 [  --with-krb4-includes[=DIR]   Specify location of kerberos4 headers],[

 CPPFLAGS="$CPPFLAGS -I$withval"

 KRB4INC="$withval"

 want_krb4=yes

 ])



AC_ARG_WITH(krb4-libs,

 [  --with-krb4-libs[=DIR]   Specify location of kerberos4 libs],[

 LDFLAGS="$LDFLAGS -L$withval"

 KRB4LIB="$withval"

 want_krb4=yes

 ])





OPT_KRB4=off

AC_ARG_WITH(krb4,dnl

[  --with-krb4[=DIR]       where to look for Kerberos4],[

  OPT_KRB4="$withval"

  if test X"$OPT_KRB4" != Xyes

  then

    LDFLAGS="$LDFLAGS -L$OPT_KRB4/lib"

    KRB4LIB="$OPT_KRB4/lib"

    CPPFLAGS="$CPPFLAGS -I$OPT_KRB4/include"

    KRB4INC="$OPT_KRB4/include"

  fi

  want_krb4="yes"

 ])



AC_MSG_CHECKING([if Kerberos4 support is requested])



if test "$want_krb4" = yes

then

  AC_MSG_RESULT(yes)



  dnl Check for & handle argument to --with-krb4



  AC_MSG_CHECKING(where to look for Kerberos4)

  if test X"$OPT_KRB4" = Xyes

  then

    AC_MSG_RESULT([defaults])

  else

    AC_MSG_RESULT([libs in $KRB4LIB, headers in $KRB4INC])

  fi



  dnl Check for DES library

  AC_CHECK_LIB(des, des_pcbc_encrypt,

  [

    AC_CHECK_HEADERS(des.h)



    dnl resolv lib?

    AC_CHECK_FUNC(res_search, , AC_CHECK_LIB(resolv, res_search))



    dnl Check for the Kerberos4 library

    AC_CHECK_LIB(krb, krb_net_read,

    [

      dnl Check for header files

      AC_CHECK_HEADERS(krb.h)



      dnl we found the required libraries, add to LIBS

      LIBS="-lkrb -ldes $LIBS"



      dnl Check for function krb_get_our_ip_for_realm

      dnl this is needed for NAT networks

      AC_CHECK_FUNCS(krb_get_our_ip_for_realm)



      dnl add define KRB4

      AC_DEFINE(KRB4)



      dnl the krb4 stuff needs a strlcpy()

      AC_CHECK_FUNCS(strlcpy)



    ])

  ])

else

  AC_MSG_RESULT(no)

fi



dnl **********************************************************************

dnl Check for the presence of SSL libraries and headers

dnl **********************************************************************
@@ -118,6 +200,12 @@ else 
    fi



  fi



  dnl these can only exist if openssl exists



  AC_CHECK_FUNCS( RAND_status \

                  RAND_screen )



fi



dnl **********************************************************************
@@ -439,9 +527,7 @@ AC_CHECK_FUNCS( socket \ 
                perror \

                getpass \

                closesocket \

                setvbuf \

                RAND_status \

                RAND_screen

                setvbuf

)



if test "$ac_cv_func_select" != "yes"; then