diff options
Diffstat (limited to 'crypto/heimdal/cf')
-rw-r--r-- | crypto/heimdal/cf/ChangeLog | 14 | ||||
-rw-r--r-- | crypto/heimdal/cf/Makefile.am.common | 5 | ||||
-rw-r--r-- | crypto/heimdal/cf/broken-glob.m4 | 7 | ||||
-rw-r--r-- | crypto/heimdal/cf/krb-ipv6.m4 | 5 | ||||
-rw-r--r-- | crypto/heimdal/cf/roken-frag.m4 | 15 |
5 files changed, 40 insertions, 6 deletions
diff --git a/crypto/heimdal/cf/ChangeLog b/crypto/heimdal/cf/ChangeLog index 77eec6d..e56198a 100644 --- a/crypto/heimdal/cf/ChangeLog +++ b/crypto/heimdal/cf/ChangeLog @@ -1,3 +1,17 @@ +2001-03-26 Assar Westerlund <assar@sics.se> + + * broken-glob.m4: also test for GLOB_LIMIT + * krb-ipv6.m4: restore CFLAGS if v6 is not detected + +2001-02-20 Assar Westerlund <assar@sics.se> + + * roken-frag.m4: check for getprogname, setprogname + +2001-02-07 Assar Westerlund <assar@sics.se> + + * Makefile.am.common (LIB_kdfs): set. use it. from Ake Sandgren + <ake@cs.umu.se> + 2000-12-26 Assar Westerlund <assar@sics.se> * krb-ipv6.m4: remove some dnl that weren't the correct with diff --git a/crypto/heimdal/cf/Makefile.am.common b/crypto/heimdal/cf/Makefile.am.common index 6e31c74..963460c 100644 --- a/crypto/heimdal/cf/Makefile.am.common +++ b/crypto/heimdal/cf/Makefile.am.common @@ -1,4 +1,4 @@ -# $Id: Makefile.am.common,v 1.23 2000/12/05 09:11:09 joda Exp $ +# $Id: Makefile.am.common,v 1.26 2001/05/21 13:27:48 joda Exp $ AUTOMAKE_OPTIONS = foreign no-dependencies @@ -176,3 +176,6 @@ LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \ LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la endif +if DCE +LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la +endif diff --git a/crypto/heimdal/cf/broken-glob.m4 b/crypto/heimdal/cf/broken-glob.m4 index 8d52792..149c957 100644 --- a/crypto/heimdal/cf/broken-glob.m4 +++ b/crypto/heimdal/cf/broken-glob.m4 @@ -1,4 +1,4 @@ -dnl $Id: broken-glob.m4,v 1.2 1999/03/01 09:52:15 joda Exp $ +dnl $Id: broken-glob.m4,v 1.3 2001/03/26 11:40:24 assar Exp $ dnl dnl check for glob(3) dnl @@ -8,12 +8,13 @@ ac_cv_func_glob_working=yes AC_TRY_LINK([ #include <stdio.h> #include <glob.h>],[ -glob(NULL, GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE, NULL, NULL); +glob(NULL, GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|GLOB_LIMIT, +NULL, NULL); ],:,ac_cv_func_glob_working=no,:)) if test "$ac_cv_func_glob_working" = yes; then AC_DEFINE(HAVE_GLOB, 1, [define if you have a glob() that groks - GLOB_BRACE, GLOB_NOCHECK, GLOB_QUOTE, and GLOB_TILDE]) + GLOB_BRACE, GLOB_NOCHECK, GLOB_QUOTE, GLOB_TILDE, and GLOB_LIMIT]) fi if test "$ac_cv_func_glob_working" = yes; then AC_NEED_PROTO([#include <stdio.h> diff --git a/crypto/heimdal/cf/krb-ipv6.m4 b/crypto/heimdal/cf/krb-ipv6.m4 index 785d69e..bb494c1 100644 --- a/crypto/heimdal/cf/krb-ipv6.m4 +++ b/crypto/heimdal/cf/krb-ipv6.m4 @@ -1,4 +1,4 @@ -dnl $Id: krb-ipv6.m4,v 1.9 2000/12/26 20:27:30 assar Exp $ +dnl $Id: krb-ipv6.m4,v 1.10 2001/03/26 03:28:03 assar Exp $ dnl dnl test for IPv6 dnl @@ -8,6 +8,7 @@ AC_ARG_WITH(ipv6, if test "$withval" = "no"; then ac_cv_lib_ipv6=no fi]) +save_CFLAGS="${CFLAGS}" AC_CACHE_VAL(ac_cv_lib_ipv6, [dnl check for different v6 implementations (by itojun) v6type=unknown @@ -118,5 +119,7 @@ AC_MSG_CHECKING(for IPv6) AC_MSG_RESULT($ac_cv_lib_ipv6) if test "$ac_cv_lib_ipv6" = yes; then AC_DEFINE(HAVE_IPV6, 1, [Define if you have IPv6.]) +else + CFLAGS="${save_CFLAGS}" fi ]) diff --git a/crypto/heimdal/cf/roken-frag.m4 b/crypto/heimdal/cf/roken-frag.m4 index c6b552e..fb0c14be 100644 --- a/crypto/heimdal/cf/roken-frag.m4 +++ b/crypto/heimdal/cf/roken-frag.m4 @@ -1,4 +1,4 @@ -dnl $Id: roken-frag.m4,v 1.19 2000/12/15 14:29:54 assar Exp $ +dnl $Id: roken-frag.m4,v 1.21 2001/05/11 13:58:21 joda Exp $ dnl dnl some code to get roken working dnl @@ -72,6 +72,7 @@ AC_CHECK_HEADERS([\ rpcsvc/dbm.h \ rpcsvc/ypclnt.h \ shadow.h \ + sys/bswap.h \ sys/ioctl.h \ sys/param.h \ sys/proc.h \ @@ -163,8 +164,10 @@ AC_CHECK_FUNCS([ \ asprintf \ cgetent \ getconfattr \ + getprogname \ getrlimit \ getspnam \ + setprogname \ strsvis \ strunvis \ strvis \ @@ -241,6 +244,16 @@ AC_NEED_PROTO([ vasnprintf)dnl fi +AC_FIND_FUNC_NO_LIBS(bswap16,, +[#ifdef HAVE_SYS_BSWAP_H +#include <sys/bswap.h> +#endif],0) + +AC_FIND_FUNC_NO_LIBS(bswap32,, +[#ifdef HAVE_SYS_BSWAP_H +#include <sys/bswap.h> +#endif],0) + AC_FIND_FUNC_NO_LIBS(pidfile,util, [#ifdef HAVE_UTIL_H #include <util.h> |