diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2001-08-31 04:56:50 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2001-08-31 04:56:50 +0000 |
| commit | 09f31779d610a4ee811e8bd760874dcbb0d75854 (patch) | |
| tree | 2220bb6c22a98e27f96d95bba824db14681f1c99 /src | |
| parent | ea6840ee94719303130e151643fa10f668814174 (diff) | |
| download | krb5-09f31779d610a4ee811e8bd760874dcbb0d75854.tar.gz krb5-09f31779d610a4ee811e8bd760874dcbb0d75854.tar.xz krb5-09f31779d610a4ee811e8bd760874dcbb0d75854.zip | |
* aclocal.m4 (AC_KRB5_TCL_FIND_CONFIG): Do put /usr/include/tcl$v in
TCL_INCLUDES if that's where tcl.h is found. Don't include tcl.h when testing
to see if Tcl_CreateInterp is available.
(KRB5_AC_CHECK_INET6): Don't require getaddrinfo support.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13710 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/aclocal.m4 | 20 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2f03c93425..fa0940dfd9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2001-08-30 Ken Raeburn <raeburn@mit.edu> + + * aclocal.m4 (AC_KRB5_TCL_FIND_CONFIG): Do put /usr/include/tcl$v + in TCL_INCLUDES if that's where tcl.h is found. Don't include + tcl.h when testing to see if Tcl_CreateInterp is available. + (KRB5_AC_CHECK_INET6): Don't require getaddrinfo support. + 2001-08-21 Ken Raeburn <raeburn@mit.edu> * aclocal.m4 (KRB5_AC_CHECK_INET6): Don't check for diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 8b9a91db47..da042808cd 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -246,7 +246,7 @@ AC_MSG_CHECKING(for IPv6 compile-time support) AC_CACHE_VAL(krb5_cv_inet6,[ dnl NetBSD and Linux both seem to have gotten get*info but not getipnodeby* dnl as of the time I'm writing this, so we'll use get*info only. -if test "$ac_cv_func_inet_ntop/$ac_cv_func_getaddrinfo" != "yes/yes" ; then +if test "$ac_cv_func_inet_ntop != "yes ; then krb5_cv_inet6=no else AC_TRY_COMPILE([ @@ -263,11 +263,8 @@ AC_TRY_COMPILE([ ],[ struct sockaddr_in6 in; struct sockaddr_storage x; - struct addrinfo ai; AF_INET6; IN6_IS_ADDR_LINKLOCAL (&in.sin6_addr); - NI_NOFQDN, NI_NUMERICHOST, NI_NAMEREQD, NI_MAXHOST, EAI_FAIL; - AI_NUMERICHOST; /* RFC 2553 */ ],krb5_cv_inet6=yes,krb5_cv_inet6=no)]) fi AC_MSG_RESULT($krb5_cv_inet6) @@ -749,8 +746,7 @@ if test -n "$tcl_conf" ; then done LIBS="$old_LIBS `eval echo x $TCL_LIB_SPEC $TCL_LIBS | sed 's/^x//'`" LDFLAGS="$old_LDFLAGS $TCL_LD_FLAGS" - AC_TRY_LINK([#include <tcl.h> -],[Tcl_CreateInterp ();], + AC_TRY_LINK( , [Tcl_CreateInterp ();], tcl_ok_conf=$file tcl_vers_maj=$TCL_MAJOR_VERSION tcl_vers_min=$TCL_MINOR_VERSION @@ -770,14 +766,14 @@ tcl_lib=no if test -n "$tcl_ok_conf" ; then . $tcl_ok_conf TCL_INCLUDES= - if test "$TCL_PREFIX" != /usr ; then - for incdir in "$TCL_PREFIX/include/tcl$v" "$TCL_PREFIX/include" ; do - if test -r "$incdir/tcl.h" -o -r "$incdir/tcl/tcl.h" ; then + for incdir in "$TCL_PREFIX/include/tcl$v" "$TCL_PREFIX/include" ; do + if test -r "$incdir/tcl.h" -o -r "$incdir/tcl/tcl.h" ; then + if test "$incdir" != "/usr/include" ; then TCL_INCLUDES=-I$incdir - break fi - done - fi + break + fi + done TCL_LIBS="$TCL_LIB_SPEC $TCL_LIBS $TCL_DL_LIBS" TCL_LIBPATH= TCL_RPATH= |