diff options
author | assar <assar@FreeBSD.org> | 2001-02-13 16:46:19 +0000 |
---|---|---|
committer | assar <assar@FreeBSD.org> | 2001-02-13 16:46:19 +0000 |
commit | ebfe6dc471c206300fd82c7c0fd145f683aa52f6 (patch) | |
tree | e66aa570ad1d12c43b32a7313b0f8e28971bf8a9 /crypto/heimdal/cf | |
parent | e5f617598c2db0dd51906a38ecea9208123a8b70 (diff) | |
download | FreeBSD-src-ebfe6dc471c206300fd82c7c0fd145f683aa52f6.zip FreeBSD-src-ebfe6dc471c206300fd82c7c0fd145f683aa52f6.tar.gz |
import of heimdal 0.3e
Diffstat (limited to 'crypto/heimdal/cf')
30 files changed, 1230 insertions, 206 deletions
diff --git a/crypto/heimdal/cf/ChangeLog b/crypto/heimdal/cf/ChangeLog index 2c21ce2..77eec6d 100644 --- a/crypto/heimdal/cf/ChangeLog +++ b/crypto/heimdal/cf/ChangeLog @@ -1,3 +1,159 @@ +2000-12-26 Assar Westerlund <assar@sics.se> + + * krb-ipv6.m4: remove some dnl that weren't the correct with + modern autoconf + +2000-12-15 Assar Westerlund <assar@sics.se> + + * roken-frag.m4 (inet_ntoa, inet_ntop, inet_pton): add necessary + includes when testing + * broken2.m4: new variant of broken, with includes and arguments + + * test-package.m4: s/ifval/m4_ifval/ to keep in sync with + autoconf. from Ake Sandgren <ake@cs.umu.se> + * check-var.m4: s/ifval/m4_ifval/ to keep in sync with autoconf. + from Ake Sandgren <ake@cs.umu.se> + +2000-12-13 Assar Westerlund <assar@sics.se> + + * krb-irix.m4: need to set irix to no first. From Ake Sandgren + <ake@cs.umu.se> + +2000-12-12 Johan Danielsson <joda@pdc.kth.se> + + * roken-frag.m4: move sa_len test to before test for broken + getnameinfo + +2000-12-12 Assar Westerlund <assar@sics.se> + + * roken-frag.m4: only test for broken getnameinfo if it exists + +2000-12-10 Johan Danielsson <joda@pdc.kth.se> + + * roken-frag.m4: ifaddrs.h + +2000-12-06 Johan Danielsson <joda@pdc.kth.se> + + * roken-frag.m4: test for unvis, and vis.h + + * roken-frag.m4: test for strvis* + +2000-12-05 Johan Danielsson <joda@pdc.kth.se> + + * Makefile.am.common: just warn if we fail to setuid a program + + * broken-getnameinfo.m4: add more quotes + + * roken-frag.m4: test for getifaddrs + + * roken-frag.m4: test for broken AIX getnameinfo + + * broken-getnameinfo.m4: test for broken getnameinfo + +2000-12-01 Assar Westerlund <assar@sics.se> + + * Makefile.am.common: add kludge for LIBS + +2000-11-30 Johan Danielsson <joda@pdc.kth.se> + + * check-man.m4: update this after recent changes + + * Makefile.am.common: use install-catman.sh + + * install-catman.sh: script to install preformatted manual pages + + * Makefile.am.common: change cat handling + +2000-11-29 Johan Danielsson <joda@pdc.kth.se> + + * roken-frag.m4: don't use AC_CONFIG_FILES here, since it doesn't + work with automake + +2000-11-15 Assar Westerlund <assar@sics.se> + + * krb-readline.m4: link against the libtool-versions of + libeditline and libel_compat + + * Makefile.am.common (INCLUDES): add $(INCLUDES_roken) + * roken-frag.m4 (CPPFLAGS_roken): rename to INCLUDES_roken + +2000-11-05 Johan Danielsson <joda@pdc.kth.se> + + * aix.m4: set aix + +2000-08-19 Assar Westerlund <assar@sics.se> + + * krb-bigendian.m4: merge from arla: make it work better + +2000-08-07 Johan Danielsson <joda@pdc.kth.se> + + * roken-frag.m4: check getsockname for proto compat + +2000-08-04 Johan Danielsson <joda@pdc.kth.se> + + * Makefile.am.common: add library for pidfile + + * roken-frag.m4: tests for util.h and pidfile + +2000-07-19 Johan Danielsson <joda@pdc.kth.se> + + * check-var.m4: rename to rk_CHECK_VAR, transposing the arguments, + and making the second optional, AU_DEFINE AC_CHECK_VAR to + rk_CHECK_VAR + + * roken-frag.m4: other roken tests + + * db.m4: db tests + +2000-07-18 Johan Danielsson <joda@pdc.kth.se> + + * mips-abi.m4: AC_ERROR -> AC_MSG_ERROR + + * check-netinet-ip-and-tcp.m4: use cache_check, and make this work + with new autoconf + + * aix.m4: don't subst AFS_EXTRA_LD + +2000-07-15 Johan Danielsson <joda@pdc.kth.se> + + * check-var.m4: workaround feature of newer autoconf + + * find-func-no-libs2.m4: use cleaner autoheader trick + + * have-type.m4: use cleaner autoheader trick + + * have-types.m4: use cleaner autoheader trick + + * test-package.m4: add 6th parameter for now + + * broken.m4: use cleaner autoheader trick + + * retsigtype.m4: test for signal handler return type + + * broken-realloc.m4: test for broken realloc + +2000-07-08 Assar Westerlund <assar@sics.se> + + * roken.m4: set CPPFLAGS_roken and call AC_CONFIG_SUBDIRS + +2000-07-02 Assar Westerlund <assar@sics.se> + + * Makefile.am.common (CP): set and use + +2000-04-05 Assar Westerlund <assar@sics.se> + + * Makefile.am.common (INCLUDE_openldap, LIB_openldap): add + +2000-03-28 Assar Westerlund <assar@sics.se> + + * krb-prog-yacc.m4: AC_MSG_WARNING should be AC_MSG_WARN + + * shared-libs.m4: try to update to freebsd5 (and elf) + +2000-03-16 Assar Westerlund <assar@sics.se> + + * krb-prog-yacc.m4: warn we do not find any yacc + 2000-01-08 Assar Westerlund <assar@sics.se> * krb-bigendian.m4: new file, replacement for ac_c_bigendian @@ -17,6 +173,10 @@ which we use in the code. This test avoids false positives on OpenBSD +1999-11-29 Johan Danielsson <joda@pdc.kth.se> + + * grok-type.m4: inttypes.h + 1999-11-05 Assar Westerlund <assar@sics.se> * check-x.m4: include X_PRE_LIBS and X_EXTRA_LIBS when testing diff --git a/crypto/heimdal/cf/Makefile.am.common b/crypto/heimdal/cf/Makefile.am.common index e7d747b..6e31c74 100644 --- a/crypto/heimdal/cf/Makefile.am.common +++ b/crypto/heimdal/cf/Makefile.am.common @@ -1,13 +1,15 @@ -# $Id: Makefile.am.common,v 1.13 1999/11/01 03:19:58 assar Exp $ +# $Id: Makefile.am.common,v 1.23 2000/12/05 09:11:09 joda Exp $ AUTOMAKE_OPTIONS = foreign no-dependencies SUFFIXES = .et .h -INCLUDES = -I$(top_builddir)/include +INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) AM_CFLAGS += $(WFLAGS) +CP = cp + COMPILE_ET = $(top_builddir)/lib/com_err/compile_et ## set build_HEADERZ to headers that should just be installed in build tree @@ -30,6 +32,7 @@ LIB_getsockopt = @LIB_getsockopt@ LIB_logout = @LIB_logout@ LIB_logwtmp = @LIB_logwtmp@ LIB_odm_initialize = @LIB_odm_initialize@ +LIB_pidfile = @LIB_pidfile@ LIB_readline = @LIB_readline@ LIB_res_search = @LIB_res_search@ LIB_setpcred = @LIB_setpcred@ @@ -38,6 +41,8 @@ LIB_socket = @LIB_socket@ LIB_syslog = @LIB_syslog@ LIB_tgetent = @LIB_tgetent@ +LIBS = @LIBS@ + HESIODLIB = @HESIODLIB@ HESIODINCLUDE = @HESIODINCLUDE@ INCLUDE_hesiod = @INCLUDE_hesiod@ @@ -46,6 +51,9 @@ LIB_hesiod = @LIB_hesiod@ INCLUDE_krb4 = @INCLUDE_krb4@ LIB_krb4 = @LIB_krb4@ +INCLUDE_openldap = @INCLUDE_openldap@ +LIB_openldap = @LIB_openldap@ + INCLUDE_readline = @INCLUDE_readline@ LIB_readline = @LIB_readline@ @@ -56,7 +64,10 @@ install-suid-programs: for file in $$foo; do \ x=$(DESTDIR)$(bindir)/$$file; \ if chown 0:0 $$x && chmod u+s $$x; then :; else \ - chmod 0 $$x; fi; done + echo "*"; \ + echo "* Failed to install $$x setuid root"; \ + echo "*"; \ + fi; done install-exec-hook: install-suid-programs @@ -68,21 +79,13 @@ install-build-headers:: $(include_HEADERS) $(build_HEADERZ) else file="$$f"; fi; \ if cmp -s $$file $(buildinclude)/$$f 2> /dev/null ; then \ : ; else \ - echo " cp $$file $(buildinclude)/$$f"; \ - cp $$file $(buildinclude)/$$f; \ + echo " $(CP) $$file $(buildinclude)/$$f"; \ + $(CP) $$file $(buildinclude)/$$f; \ fi ; \ done all-local: install-build-headers -cat1dir = $(mandir)/cat1 -cat3dir = $(mandir)/cat3 -cat5dir = $(mandir)/cat5 -cat8dir = $(mandir)/cat8 - -MANRX = \(.*\)\.\([0-9]\) -CATSUFFIX = @CATSUFFIX@ - SUFFIXES += .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 NROFF_MAN = groff -mandoc -Tascii @@ -152,88 +155,8 @@ dist-cat8-mans: dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat8-mans -install-cat1-mans: - @ext=1;\ - foo='$(man1_MANS)'; \ - bar='$(man_MANS)'; \ - for i in $$bar; do \ - case $$i in \ - *.1) foo="$$foo $$i";; \ - esac; done; \ - if test "$$foo"; then \ - $(mkinstalldirs) $(DESTDIR)$(cat1dir); \ - for x in $$foo; do \ - f=`echo $$x | sed 's/\.[^.]*$$/.cat1/'`; \ - if test -f "$(srcdir)/$$f"; then \ - b=`echo $$x | sed 's!$(MANRX)!\1!'`; \ - echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat1dir)/$$b.$(CATSUFFIX)";\ - $(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat1dir)/$$b.$(CATSUFFIX);\ - fi; \ - done ;\ - fi - -install-cat3-mans: - @ext=3;\ - foo='$(man3_MANS)'; \ - bar='$(man_MANS)'; \ - for i in $$bar; do \ - case $$i in \ - *.3) foo="$$foo $$i";; \ - esac; done; \ - if test "$$foo"; then \ - $(mkinstalldirs) $(DESTDIR)$(cat3dir); \ - for x in $$foo; do \ - f=`echo $$x | sed 's/\.[^.]*$$/.cat3/'`; \ - if test -f "$(srcdir)/$$f"; then \ - b=`echo $$x | sed 's!$(MANRX)!\1!'`; \ - echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat3dir)/$$b.$(CATSUFFIX)";\ - $(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat3dir)/$$b.$(CATSUFFIX);\ - fi; \ - done ;\ - fi - -install-cat5-mans: - @ext=5;\ - foo='$(man5_MANS)'; \ - bar='$(man_MANS)'; \ - for i in $$bar; do \ - case $$i in \ - *.5) foo="$$foo $$i";; \ - esac; done; \ - if test "$$foo"; then \ - $(mkinstalldirs) $(DESTDIR)$(cat5dir); \ - for x in $$foo; do \ - f=`echo $$x | sed 's/\.[^.]*$$/.cat5/'`; \ - if test -f "$(srcdir)/$$f"; then \ - b=`echo $$x | sed 's!$(MANRX)!\1!'`; \ - echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat5dir)/$$b.$(CATSUFFIX)";\ - $(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat5dir)/$$b.$(CATSUFFIX);\ - fi; \ - done ;\ - fi - -install-cat8-mans: - @ext=8;\ - foo='$(man8_MANS)'; \ - bar='$(man_MANS)'; \ - for i in $$bar; do \ - case $$i in \ - *.8) foo="$$foo $$i";; \ - esac; done; \ - if test "$$foo"; then \ - $(mkinstalldirs) $(DESTDIR)$(cat8dir); \ - for x in $$foo; do \ - f=`echo $$x | sed 's/\.[^.]*$$/.cat8/'`; \ - if test -f "$(srcdir)/$$f"; then \ - b=`echo $$x | sed 's!$(MANRX)!\1!'`; \ - echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat8dir)/$$b.$(CATSUFFIX)";\ - $(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat8dir)/$$b.$(CATSUFFIX);\ - fi; \ - done ;\ - fi - - -install-cat-mans: install-cat1-mans install-cat3-mans install-cat5-mans install-cat8-mans +install-cat-mans: + $(SHELL) $(top_srcdir)/cf/install-catman.sh "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS) install-data-local: install-cat-mans diff --git a/crypto/heimdal/cf/aix.m4 b/crypto/heimdal/cf/aix.m4 new file mode 100644 index 0000000..25aaa2a --- /dev/null +++ b/crypto/heimdal/cf/aix.m4 @@ -0,0 +1,39 @@ +dnl +dnl $Id: aix.m4,v 1.5 2000/11/05 17:15:46 joda Exp $ +dnl + +AC_DEFUN(KRB_AIX,[ +aix=no +case "$host" in +*-*-aix3*) + aix=3 + ;; +*-*-aix4*) + aix=4 + ;; +esac +AM_CONDITIONAL(AIX, test "$aix" != no)dnl +AM_CONDITIONAL(AIX4, test "$aix" = 4) +aix_dynamic_afs=yes +AM_CONDITIONAL(AIX_DYNAMIC_AFS, test "$aix_dynamic_afs" = yes)dnl + +AC_FIND_FUNC_NO_LIBS(dlopen, dl) + +if test "$aix" != no; then + if test "$aix_dynamic_afs" = yes; then + if test "$ac_cv_funclib_dlopen" = yes; then + AIX_EXTRA_KAFS= + elif test "$ac_cv_funclib_dlopen" != no; then + AIX_EXTRA_KAFS="$ac_cv_funclib_dlopen" + else + AIX_EXTRA_KAFS=-lld + fi + else + AIX_EXTRA_KAFS= + fi +fi + +AM_CONDITIONAL(HAVE_DLOPEN, test "$ac_cv_funclib_dlopen" != no)dnl +AC_SUBST(AIX_EXTRA_KAFS)dnl + +])
\ No newline at end of file diff --git a/crypto/heimdal/cf/broken-getnameinfo.m4 b/crypto/heimdal/cf/broken-getnameinfo.m4 new file mode 100644 index 0000000..da206c0 --- /dev/null +++ b/crypto/heimdal/cf/broken-getnameinfo.m4 @@ -0,0 +1,28 @@ +dnl $Id: broken-getnameinfo.m4,v 1.2 2000/12/05 09:09:00 joda Exp $ +dnl +dnl test for broken AIX getnameinfo + +AC_DEFUN(rk_BROKEN_GETNAMEINFO,[ +AC_CACHE_CHECK([if getnameinfo is broken], ac_cv_func_getnameinfo_broken, +AC_TRY_RUN([[#include <stdio.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <netdb.h> + +int +main(int argc, char **argv) +{ + struct sockaddr_in sin; + char host[256]; + memset(&sin, 0, sizeof(sin)); +#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN + sin.sin_len = sizeof(sin); +#endif + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = 0xffffffff; + sin.sin_port = 0; + return getnameinfo((struct sockaddr*)&sin, sizeof(sin), host, sizeof(host), + NULL, 0, 0); +} +]], ac_cv_func_getnameinfo_broken=no, ac_cv_func_getnameinfo_broken=yes))]) diff --git a/crypto/heimdal/cf/broken-realloc.m4 b/crypto/heimdal/cf/broken-realloc.m4 new file mode 100644 index 0000000..1569255 --- /dev/null +++ b/crypto/heimdal/cf/broken-realloc.m4 @@ -0,0 +1,26 @@ +dnl +dnl $Id: broken-realloc.m4,v 1.1 2000/07/15 18:05:36 joda Exp $ +dnl +dnl Test for realloc that doesn't handle NULL as first parameter +dnl +AC_DEFUN(rk_BROKEN_REALLOC, [ +AC_CACHE_CHECK(if realloc if broken, ac_cv_func_realloc_broken, [ +ac_cv_func_realloc_broken=no +AC_TRY_RUN([ +#include <stddef.h> +#include <stdlib.h> + +int main() +{ + return realloc(NULL, 17) == NULL; +} +],:, ac_cv_func_realloc_broken=yes, :) +]) +if test "$ac_cv_func_realloc_broken" = yes ; then + AC_DEFINE(BROKEN_REALLOC, 1, [Define if realloc(NULL) doesn't work.]) +fi +AH_BOTTOM([#ifdef BROKEN_REALLOC +#define realloc(X, Y) isoc_realloc((X), (Y)) +#define isoc_realloc(X, Y) ((X) ? realloc((X), (Y)) : malloc(Y)) +#endif]) +]) diff --git a/crypto/heimdal/cf/broken.m4 b/crypto/heimdal/cf/broken.m4 index 4044064..911ed27 100644 --- a/crypto/heimdal/cf/broken.m4 +++ b/crypto/heimdal/cf/broken.m4 @@ -1,4 +1,4 @@ -dnl $Id: broken.m4,v 1.3 1998/03/16 22:16:19 joda Exp $ +dnl $Id: broken.m4,v 1.4 2000/07/15 18:06:36 joda Exp $ dnl dnl dnl Same as AC _REPLACE_FUNCS, just define HAVE_func if found in normal @@ -10,10 +10,9 @@ do AC_CHECK_FUNC($ac_func, [ ac_tr_func=HAVE_[]upcase($ac_func) AC_DEFINE_UNQUOTED($ac_tr_func)],[LIBOBJS[]="$LIBOBJS ${ac_func}.o"]) -dnl autoheader tricks *sigh* -: << END -@@@funcs="$funcs $1"@@@ -END +if false; then + AC_CHECK_FUNCS($1) +fi done AC_SUBST(LIBOBJS)dnl ]) diff --git a/crypto/heimdal/cf/broken2.m4 b/crypto/heimdal/cf/broken2.m4 new file mode 100644 index 0000000..78a3dcb --- /dev/null +++ b/crypto/heimdal/cf/broken2.m4 @@ -0,0 +1,35 @@ +dnl $Id: broken2.m4,v 1.1 2000/12/15 14:27:33 assar Exp $ +dnl +dnl AC_BROKEN but with more arguments + +dnl AC_BROKEN2(func, includes, arguments) +AC_DEFUN(AC_BROKEN2, +[for ac_func in $1 +do +AC_MSG_CHECKING([for $ac_func]) +AC_CACHE_VAL(ac_cv_func_$ac_func, +[AC_TRY_LINK([$2], +[ +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$1) || defined (__stub___$1) +choke me +#else +$ac_func($3) +#endif +], [eval "ac_cv_func_$ac_func=yes"], [eval "ac_cv_func_$ac_func=no"])]) +if eval "test \"\${ac_cv_func_$ac_func}\" = yes"; then + ac_tr_func=HAVE_[]upcase($ac_func) + AC_DEFINE_UNQUOTED($ac_tr_func) + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) + LIBOBJS[]="$LIBOBJS ${ac_func}.o" +fi +done +if false; then + AC_CHECK_FUNCS($1) +fi +AC_SUBST(LIBOBJS)dnl +]) diff --git a/crypto/heimdal/cf/check-man.m4 b/crypto/heimdal/cf/check-man.m4 index 2133069..adf5477 100644 --- a/crypto/heimdal/cf/check-man.m4 +++ b/crypto/heimdal/cf/check-man.m4 @@ -1,8 +1,8 @@ -dnl $Id: check-man.m4,v 1.2 1999/03/21 14:30:50 joda Exp $ +dnl $Id: check-man.m4,v 1.3 2000/11/30 01:47:17 joda Exp $ dnl check how to format manual pages dnl -AC_DEFUN(AC_CHECK_MAN, +AC_DEFUN(rk_CHECK_MAN, [AC_PATH_PROG(NROFF, nroff) AC_PATH_PROG(GROFF, groff) AC_CACHE_CHECK(how to format man pages,ac_cv_sys_man_format, @@ -50,10 +50,9 @@ else fi ]) if test "$ac_cv_sys_catman_ext" = number; then - CATMANEXT='$$ext' + CATMANEXT='$$section' else CATMANEXT=0 fi AC_SUBST(CATMANEXT) - ])
\ No newline at end of file diff --git a/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4 b/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4 index 8cb529d..70b58f5 100644 --- a/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4 +++ b/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4 @@ -1,5 +1,5 @@ dnl -dnl $Id: check-netinet-ip-and-tcp.m4,v 1.2 1999/05/14 13:15:40 assar Exp $ +dnl $Id: check-netinet-ip-and-tcp.m4,v 1.3 2000/07/18 10:33:02 joda Exp $ dnl dnl extra magic check for netinet/{ip.h,tcp.h} because on irix 6.5.3 @@ -12,8 +12,7 @@ for i in netinet/ip.h netinet/tcp.h; do cv=`echo "$i" | sed 'y%./+-%__p_%'` -AC_MSG_CHECKING([for $i]) -AC_CACHE_VAL([ac_cv_header_$cv], +AC_CACHE_CHECK([for $i],ac_cv_header_$cv, [AC_TRY_CPP([\ #ifdef HAVE_STANDARDS_H #include <standards.h> @@ -22,17 +21,13 @@ AC_CACHE_VAL([ac_cv_header_$cv], ], eval "ac_cv_header_$cv=yes", eval "ac_cv_header_$cv=no")]) -AC_MSG_RESULT(`eval echo \\$ac_cv_header_$cv`) -changequote(, )dnl -if test `eval echo \\$ac_cv_header_$cv` = yes; then - ac_tr_hdr=HAVE_`echo $i | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -changequote([, ])dnl - AC_DEFINE_UNQUOTED($ac_tr_hdr, 1) +ac_res=`eval echo \\$ac_cv_header_$cv` +if test "$ac_res" = yes; then + ac_tr_hdr=HAVE_`echo $i | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + AC_DEFINE_UNQUOTED($ac_tr_hdr, 1) fi done -dnl autoheader tricks *sigh* -: << END -@@@headers="$headers netinet/ip.h netinet/tcp.h"@@@ -END - +if false;then + AC_CHECK_HEADERS(netinet/ip.h netinet/tcp.h) +fi ]) diff --git a/crypto/heimdal/cf/check-var.m4 b/crypto/heimdal/cf/check-var.m4 index 9f37366..8041c32 100644 --- a/crypto/heimdal/cf/check-var.m4 +++ b/crypto/heimdal/cf/check-var.m4 @@ -1,20 +1,22 @@ -dnl $Id: check-var.m4,v 1.2 1999/03/01 09:52:23 joda Exp $ +dnl $Id: check-var.m4,v 1.5 2000/12/15 04:54:06 assar Exp $ dnl -dnl AC_CHECK_VAR(includes, variable) -AC_DEFUN(AC_CHECK_VAR, [ -AC_MSG_CHECKING(for $2) -AC_CACHE_VAL(ac_cv_var_$2, [ -AC_TRY_LINK([extern int $2; -int foo() { return $2; }], +dnl rk_CHECK_VAR(variable, includes) +AC_DEFUN([rk_CHECK_VAR], [ +AC_MSG_CHECKING(for $1) +AC_CACHE_VAL(ac_cv_var_$1, [ +AC_TRY_LINK([extern int $1; +int foo() { return $1; }], [foo()], - ac_cv_var_$2=yes, ac_cv_var_$2=no) + ac_cv_var_$1=yes, ac_cv_var_$1=no) ]) -define([foo], [HAVE_]translit($2, [a-z], [A-Z])) - -AC_MSG_RESULT(`eval echo \\$ac_cv_var_$2`) -if test `eval echo \\$ac_cv_var_$2` = yes; then - AC_DEFINE_UNQUOTED(foo, 1, [define if you have $2]) - AC_CHECK_DECLARATION([$1],[$2]) +ac_foo=`eval echo \\$ac_cv_var_$1` +AC_MSG_RESULT($ac_foo) +if test "$ac_foo" = yes; then + AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_[]$1), 1, + [Define if you have the `]$1[' variable.]) + m4_ifval([$2], AC_CHECK_DECLARATION([$2],[$1])) fi -undefine([foo]) ]) + +AC_WARNING_ENABLE([obsolete]) +AU_DEFUN([AC_CHECK_VAR], [rk_CHECK_VAR([$2], [$1])], [foo])
\ No newline at end of file diff --git a/crypto/heimdal/cf/db.m4 b/crypto/heimdal/cf/db.m4 new file mode 100644 index 0000000..c147569 --- /dev/null +++ b/crypto/heimdal/cf/db.m4 @@ -0,0 +1,40 @@ +dnl $Id: db.m4,v 1.1 2000/07/19 11:21:07 joda Exp $ +dnl +dnl tests for various db libraries +dnl +AC_DEFUN([rk_DB],[berkeley_db=db +AC_ARG_WITH(berkeley-db, +[ --without-berkeley-db if you don't want berkeley db],[ +if test "$withval" = no; then + berkeley_db="" +fi +]) +if test "$berkeley_db"; then + AC_CHECK_HEADERS([ \ + db.h \ + db_185.h \ + ]) +fi + +AC_FIND_FUNC_NO_LIBS2(dbopen, $berkeley_db, [ +#include <stdio.h> +#if defined(HAVE_DB_185_H) +#include <db_185.h> +#elif defined(HAVE_DB_H) +#include <db.h> +#endif +],[NULL, 0, 0, 0, NULL]) + +AC_FIND_FUNC_NO_LIBS(dbm_firstkey, $berkeley_db gdbm ndbm) +AC_FIND_FUNC_NO_LIBS(db_create, $berkeley_db) + +DBLIB="$LIB_dbopen" +if test "$LIB_dbopen" != "$LIB_db_create"; then + DBLIB="$DBLIB $LIB_db_create" +fi +if test "$LIB_dbopen" != "$LIB_dbm_firstkey"; then + DBLIB="$DBLIB $LIB_dbm_firstkey" +fi +AC_SUBST(DBLIB)dnl + +]) diff --git a/crypto/heimdal/cf/find-func-no-libs2.m4 b/crypto/heimdal/cf/find-func-no-libs2.m4 index c404a7c..87e8984 100644 --- a/crypto/heimdal/cf/find-func-no-libs2.m4 +++ b/crypto/heimdal/cf/find-func-no-libs2.m4 @@ -1,4 +1,4 @@ -dnl $Id: find-func-no-libs2.m4,v 1.3 1999/10/30 21:09:53 assar Exp $ +dnl $Id: find-func-no-libs2.m4,v 1.4 2000/07/15 18:10:19 joda Exp $ dnl dnl dnl Look for function in any of the specified libraries @@ -28,12 +28,10 @@ fi eval "ac_res=\$ac_cv_funclib_$1" -dnl autoheader tricks *sigh* -: << END -@@@funcs="$funcs $1"@@@ -@@@libs="$libs $2"@@@ -END - +if false; then + AC_CHECK_FUNCS($1) +dnl AC_CHECK_LIBS($2, foo) +fi # $1 eval "ac_tr_func=HAVE_[]upcase($1)" eval "ac_tr_lib=HAVE_LIB[]upcase($ac_res | sed -e 's/-l//')" diff --git a/crypto/heimdal/cf/have-type.m4 b/crypto/heimdal/cf/have-type.m4 index e882847..4b79e1e 100644 --- a/crypto/heimdal/cf/have-type.m4 +++ b/crypto/heimdal/cf/have-type.m4 @@ -1,4 +1,4 @@ -dnl $Id: have-type.m4,v 1.5 1999/12/31 03:10:22 assar Exp $ +dnl $Id: have-type.m4,v 1.6 2000/07/15 18:10:00 joda Exp $ dnl dnl check for existance of a type @@ -18,15 +18,13 @@ $2], [$1 foo;], eval "ac_cv_type_$cv=yes", eval "ac_cv_type_$cv=no"))dnl -AC_MSG_RESULT(`eval echo \\$ac_cv_type_$cv`) -if test `eval echo \\$ac_cv_type_$cv` = yes; then +ac_foo=`eval echo \\$ac_cv_type_$cv` +AC_MSG_RESULT($ac_foo) +if test "$ac_foo" = yes; then ac_tr_hdr=HAVE_`echo $1 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'` -dnl autoheader tricks *sigh* -define(foo,translit($1, [ ], [_])) -: << END -@@@funcs="$funcs foo"@@@ -END -undefine([foo]) - AC_DEFINE_UNQUOTED($ac_tr_hdr, 1) +if false; then + AC_CHECK_TYPES($1) +fi + AC_DEFINE_UNQUOTED($ac_tr_hdr, 1, [Define if you have type `$1']) fi ]) diff --git a/crypto/heimdal/cf/have-types.m4 b/crypto/heimdal/cf/have-types.m4 index 7c85c5d..b968d4b 100644 --- a/crypto/heimdal/cf/have-types.m4 +++ b/crypto/heimdal/cf/have-types.m4 @@ -1,14 +1,12 @@ dnl -dnl $Id: have-types.m4,v 1.1 1999/07/24 18:38:58 assar Exp $ +dnl $Id: have-types.m4,v 1.2 2000/07/15 18:09:16 joda Exp $ dnl AC_DEFUN(AC_HAVE_TYPES, [ for i in $1; do AC_HAVE_TYPE($i) done -: << END -changequote(`,')dnl -@@@funcs="$funcs $1"@@@ -changequote([,])dnl -END +if false;then + AC_CHECK_FUNCS($1) +fi ]) diff --git a/crypto/heimdal/cf/install-catman.sh b/crypto/heimdal/cf/install-catman.sh new file mode 100755 index 0000000..c48cc20 --- /dev/null +++ b/crypto/heimdal/cf/install-catman.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# +# $Id: install-catman.sh,v 1.1 2000/11/30 01:38:17 joda Exp $ +# +# install preformatted manual pages + +INSTALL_DATA="$1"; shift +mkinstalldirs="$1"; shift +srcdir="$1"; shift +mandir="$1"; shift +suffix="$1"; shift + +for f in "$@"; do + base=`echo "$f" | sed 's/\(.*\)\.\([^.]*\)$/\1/'` + section=`echo "$f" | sed 's/\(.*\)\.\([^.]*\)$/\2/'` + catdir="$mandir/cat$section" + c="$base.cat$section" + if test -f "$srcdir/$c"; then + if test \! -d "$catdir"; then + eval "$mkinstalldirs $catdir" + fi + eval "echo $INSTALL_DATA $srcdir/$c $catdir/$base.$suffix" + eval "$INSTALL_DATA $srcdir/$c $catdir/$base.$suffix" + fi +done diff --git a/crypto/heimdal/cf/krb-bigendian.m4 b/crypto/heimdal/cf/krb-bigendian.m4 index 0efbbd0..ab16931 100644 --- a/crypto/heimdal/cf/krb-bigendian.m4 +++ b/crypto/heimdal/cf/krb-bigendian.m4 @@ -1,5 +1,5 @@ dnl -dnl $Id: krb-bigendian.m4,v 1.5 2000/01/08 10:34:44 assar Exp $ +dnl $Id: krb-bigendian.m4,v 1.6 2000/08/19 15:37:00 assar Exp $ dnl dnl check if this computer is little or big-endian @@ -22,34 +22,30 @@ krb_cv_c_bigendian_compile, #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN bogus endian macros #endif], krb_cv_c_bigendian_compile=yes, krb_cv_c_bigendian_compile=no)]) -if test "$krb_cv_c_bigendian_compile" = "no"; then - AC_CACHE_CHECK(whether byte ordering is bigendian, krb_cv_c_bigendian,[ - if test "$krb_cv_c_bigendian" = ""; then - krb_cv_c_bigendian=unknown - fi - AC_TRY_COMPILE([ +AC_CACHE_CHECK(whether byte ordering is bigendian, krb_cv_c_bigendian,[ + if test "$krb_cv_c_bigendian_compile" = "yes"; then + AC_TRY_COMPILE([ #include <sys/types.h> #include <sys/param.h>],[ #if BYTE_ORDER != BIG_ENDIAN not big endian #endif], krb_cv_c_bigendian=yes, krb_cv_c_bigendian=no) - if test "$krb_cv_c_bigendian" = "unknown"; then + else AC_TRY_RUN([main () { /* Are we little or big endian? From Harbison&Steele. */ union { long l; char c[sizeof (long)]; - } u; - u.l = 1; - exit (u.c[sizeof (long) - 1] == 1); - }], krb_cv_c_bigendian=no, krb_cv_c_bigendian=yes, - AC_MSG_ERROR([specify either --enable-bigendian or --enable-littleendian])) - fi - ]) - if test "$krb_cv_c_bigendian" = "yes"; then - AC_DEFINE(WORDS_BIGENDIAN, 1, [define if target is big endian])dnl + } u; + u.l = 1; + exit (u.c[sizeof (long) - 1] == 1); + }], krb_cv_c_bigendian=no, krb_cv_c_bigendian=yes, + AC_MSG_ERROR([specify either --enable-bigendian or --enable-littleendian])) fi +]) +if test "$krb_cv_c_bigendian" = "yes"; then + AC_DEFINE(WORDS_BIGENDIAN, 1, [define if target is big endian])dnl fi if test "$krb_cv_c_bigendian_compile" = "yes"; then AC_DEFINE(ENDIANESS_IN_SYS_PARAM_H, 1, [define if sys/param.h defines the endiness])dnl diff --git a/crypto/heimdal/cf/krb-find-db.m4 b/crypto/heimdal/cf/krb-find-db.m4 index 5080049..5d38f2e 100644 --- a/crypto/heimdal/cf/krb-find-db.m4 +++ b/crypto/heimdal/cf/krb-find-db.m4 @@ -1,4 +1,4 @@ -dnl $Id: krb-find-db.m4,v 1.5 1999/05/08 02:24:04 assar Exp $ +dnl $Id: krb-find-db.m4,v 1.6 2000/08/16 03:58:51 assar Exp $ dnl dnl find a suitable database library dnl @@ -28,6 +28,8 @@ for i in $1; do #include <fcntl.h> #if defined(HAVE_NDBM_H) #include <ndbm.h> +#elif defined(HAVE_GDBM_NDBM_H) +#include <gdbm/ndbm.h> #elif defined(HAVE_DBM_H) #include <dbm.h> #elif defined(HAVE_RPCSVC_DBM_H) diff --git a/crypto/heimdal/cf/krb-ipv6.m4 b/crypto/heimdal/cf/krb-ipv6.m4 index 1644da3..785d69e 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.8 2000/01/01 11:44:45 assar Exp $ +dnl $Id: krb-ipv6.m4,v 1.9 2000/12/26 20:27:30 assar Exp $ dnl dnl test for IPv6 dnl @@ -17,7 +17,7 @@ AC_MSG_CHECKING([ipv6 stack type]) for i in v6d toshiba kame inria zeta linux; do case $i in v6d) - AC_EGREP_CPP(yes, [dnl + AC_EGREP_CPP(yes, [ #include </usr/local/v6/include/sys/types.h> #ifdef __V6D__ yes @@ -27,7 +27,7 @@ yes CFLAGS="-I/usr/local/v6/include $CFLAGS"]) ;; toshiba) - AC_EGREP_CPP(yes, [dnl + AC_EGREP_CPP(yes, [ #include <sys/param.h> #ifdef _TOSHIBA_INET6 yes @@ -37,7 +37,7 @@ yes CFLAGS="-DINET6 $CFLAGS"]) ;; kame) - AC_EGREP_CPP(yes, [dnl + AC_EGREP_CPP(yes, [ #include <netinet/in.h> #ifdef __KAME__ yes @@ -47,7 +47,7 @@ yes CFLAGS="-DINET6 $CFLAGS"]) ;; inria) - AC_EGREP_CPP(yes, [dnl + AC_EGREP_CPP(yes, [ #include <netinet/in.h> #ifdef IPV6_INRIA_VERSION yes @@ -55,7 +55,7 @@ yes [v6type=$i; CFLAGS="-DINET6 $CFLAGS"]) ;; zeta) - AC_EGREP_CPP(yes, [dnl + AC_EGREP_CPP(yes, [ #include <sys/param.h> #ifdef _ZETA_MINAMI_INET6 yes diff --git a/crypto/heimdal/cf/krb-irix.m4 b/crypto/heimdal/cf/krb-irix.m4 new file mode 100644 index 0000000..cdde69c --- /dev/null +++ b/crypto/heimdal/cf/krb-irix.m4 @@ -0,0 +1,12 @@ +dnl +dnl $Id: krb-irix.m4,v 1.2 2000/12/13 12:48:45 assar Exp $ +dnl + +dnl requires AC_CANONICAL_HOST +AC_DEFUN(KRB_IRIX,[ +irix=no +case "$host_os" in +irix*) irix=yes ;; +esac +AM_CONDITIONAL(IRIX, test "$irix" != no)dnl +]) diff --git a/crypto/heimdal/cf/krb-prog-yacc.m4 b/crypto/heimdal/cf/krb-prog-yacc.m4 index 28ae59c..f0b6e44 100644 --- a/crypto/heimdal/cf/krb-prog-yacc.m4 +++ b/crypto/heimdal/cf/krb-prog-yacc.m4 @@ -1,8 +1,12 @@ -dnl $Id: krb-prog-yacc.m4,v 1.1 1997/12/14 15:59:02 joda Exp $ +dnl $Id: krb-prog-yacc.m4,v 1.3 2000/03/28 12:12:23 assar Exp $ dnl dnl dnl We prefer byacc or yacc because they do not use `alloca' dnl AC_DEFUN(AC_KRB_PROG_YACC, -[AC_CHECK_PROGS(YACC, byacc yacc 'bison -y')]) +[AC_CHECK_PROGS(YACC, byacc yacc 'bison -y') +if test "$YACC" = ""; then + AC_MSG_WARN([yacc not found - some stuff will not build]) +fi +]) diff --git a/crypto/heimdal/cf/krb-readline.m4 b/crypto/heimdal/cf/krb-readline.m4 new file mode 100644 index 0000000..6d0f0b2 --- /dev/null +++ b/crypto/heimdal/cf/krb-readline.m4 @@ -0,0 +1,43 @@ +dnl $Id: krb-readline.m4,v 1.2 2000/11/15 00:47:08 assar Exp $ +dnl +dnl Tests for readline functions +dnl + +dnl el_init + +AC_DEFUN(KRB_READLINE,[ +AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent]) +if test "$ac_cv_func_el_init" = yes ; then + AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[ + AC_TRY_COMPILE([#include <stdio.h> + #include <histedit.h>], + [el_init("", NULL, NULL, NULL);], + ac_cv_func_el_init_four=yes, + ac_cv_func_el_init_four=no)]) + if test "$ac_cv_func_el_init_four" = yes; then + AC_DEFINE(HAVE_FOUR_VALUED_EL_INIT, 1, [Define if el_init takes four arguments.]) + fi +fi + +dnl readline + +ac_foo=no +if test "$with_readline" = yes; then + : +elif test "$ac_cv_func_readline" = yes; then + : +elif test "$ac_cv_func_el_init" = yes; then + ac_foo=yes + LIB_readline="\$(top_builddir)/lib/editline/libel_compat.la $LIB_el_init" +else + LIB_readline='$(top_builddir)/lib/editline/libeditline.la' +fi +AM_CONDITIONAL(el_compat, test "$ac_foo" = yes) +if test "$readline_libdir"; then + LIB_readline="-rpath $readline_libdir $LIB_readline" +fi +LIB_readline="$LIB_readline \$(LIB_tgetent)" +AC_DEFINE(HAVE_READLINE, 1, + [Define if you have a readline compatible library.])dnl + +])
\ No newline at end of file diff --git a/crypto/heimdal/cf/krb-sys-nextstep.m4 b/crypto/heimdal/cf/krb-sys-nextstep.m4 index 31dc907..5dec8b1 100644 --- a/crypto/heimdal/cf/krb-sys-nextstep.m4 +++ b/crypto/heimdal/cf/krb-sys-nextstep.m4 @@ -1,21 +1,21 @@ -dnl $Id: krb-sys-nextstep.m4,v 1.2 1998/06/03 23:48:40 joda Exp $ -dnl +dnl $Id: krb-sys-nextstep.m4,v 1.3 2000/07/15 17:56:45 joda Exp $ dnl dnl NEXTSTEP is not posix compliant by default, dnl you need a switch -posix to the compiler dnl -AC_DEFUN(AC_KRB_SYS_NEXTSTEP, [ -AC_MSG_CHECKING(for NEXTSTEP) -AC_CACHE_VAL(krb_cv_sys_nextstep, +AC_DEFUN(rk_SYS_NEXTSTEP, [ +AC_CACHE_CHECK(for NeXTSTEP, rk_cv_sys_nextstep, [ AC_EGREP_CPP(yes, [#if defined(NeXT) && !defined(__APPLE__) yes #endif -], krb_cv_sys_nextstep=yes, krb_cv_sys_nextstep=no) ) -if test "$krb_cv_sys_nextstep" = "yes"; then +], rk_cv_sys_nextstep=yes, rk_cv_sys_nextstep=no)]) +if test "$rk_cv_sys_nextstep" = "yes"; then CFLAGS="$CFLAGS -posix" LIBS="$LIBS -posix" fi -AC_MSG_RESULT($krb_cv_sys_nextstep) +AH_BOTTOM([#if defined(HAVE_SGTTY_H) && defined(__NeXT__) +#define SGTTY +#endif]) ]) diff --git a/crypto/heimdal/cf/krb-version.m4 b/crypto/heimdal/cf/krb-version.m4 index a4a1221..9907ed1 100644 --- a/crypto/heimdal/cf/krb-version.m4 +++ b/crypto/heimdal/cf/krb-version.m4 @@ -1,4 +1,4 @@ -dnl $Id: krb-version.m4,v 1.1 1997/12/14 15:59:03 joda Exp $ +dnl $Id: krb-version.m4,v 1.2 2000/08/27 05:42:19 assar Exp $ dnl dnl dnl output a C header-file with some version strings @@ -6,8 +6,8 @@ dnl AC_DEFUN(AC_KRB_VERSION,[ dnl AC_OUTPUT_COMMANDS([ cat > include/newversion.h.in <<FOOBAR -char *${PACKAGE}_long_version = "@(#)\$Version: $PACKAGE-$VERSION by @USER@ on @HOST@ ($host) @DATE@ \$"; -char *${PACKAGE}_version = "$PACKAGE-$VERSION"; +const char *${PACKAGE}_long_version = "@(#)\$Version: $PACKAGE-$VERSION by @USER@ on @HOST@ ($host) @DATE@ \$"; +const char *${PACKAGE}_version = "$PACKAGE-$VERSION"; FOOBAR if test -f include/version.h && cmp -s include/newversion.h.in include/version.h.in; then diff --git a/crypto/heimdal/cf/mips-abi.m4 b/crypto/heimdal/cf/mips-abi.m4 index c7b8815..afd3fc0 100644 --- a/crypto/heimdal/cf/mips-abi.m4 +++ b/crypto/heimdal/cf/mips-abi.m4 @@ -1,4 +1,4 @@ -dnl $Id: mips-abi.m4,v 1.4 1998/05/16 20:44:15 joda Exp $ +dnl $Id: mips-abi.m4,v 1.5 2000/07/18 15:01:42 joda Exp $ dnl dnl dnl Check for MIPS/IRIX ABI flags. Sets $abi and $abilibdirext to some @@ -27,7 +27,7 @@ case "${with_mips_abi}" in n32|yes) abi='-mabi=n32'; abilibdirext='32' ;; 64) abi='-mabi=64'; abilibdirext='64' ;; no) abi=''; abilibdirext='';; - *) AC_ERROR("Invalid ABI specified") ;; + *) AC_MSG_ERROR("Invalid ABI specified") ;; esac if test -n "$abi" ; then ac_foo=krb_cv_gcc_`echo $abi | tr =- __` @@ -54,7 +54,7 @@ case $abi in CLAGS="$save_CFLAGS" if test $ac_res = yes; then # New GCC - AC_ERROR([$CC does not support the $with_mips_abi ABI]) + AC_MSG_ERROR([$CC does not support the $with_mips_abi ABI]) fi # Old GCC abi='' @@ -67,7 +67,7 @@ case $abi in abilibdirext='' else # Some broken GCC - AC_ERROR([$CC does not support the $with_mips_abi ABI]) + AC_MSG_ERROR([$CC does not support the $with_mips_abi ABI]) fi ;; esac @@ -79,7 +79,7 @@ case "${with_mips_abi}" in n32|yes) abi='-n32'; abilibdirext='32' ;; 64) abi='-64'; abilibdirext='64' ;; no) abi=''; abilibdirext='';; - *) AC_ERROR("Invalid ABI specified") ;; + *) AC_MSG_ERROR("Invalid ABI specified") ;; esac fi #if test -n "$GCC"; then ;; diff --git a/crypto/heimdal/cf/misc.m4 b/crypto/heimdal/cf/misc.m4 index 0be97a4..c8c3804 100644 --- a/crypto/heimdal/cf/misc.m4 +++ b/crypto/heimdal/cf/misc.m4 @@ -1,3 +1,27 @@ -dnl $Id: misc.m4,v 1.1 1997/12/14 15:59:04 joda Exp $ +dnl $Id: misc.m4,v 1.2 2000/07/19 15:04:00 joda Exp $ dnl -define(upcase,`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`)dnl +AC_DEFUN([upcase],[`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`])dnl +AC_DEFUN([rk_CONFIG_HEADER],[AH_TOP([#ifndef RCSID +#define RCSID(msg) \ +static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } +#endif + +#undef BINDIR +#undef LIBDIR +#undef LIBEXECDIR +#undef SBINDIR + +#undef HAVE_INT8_T +#undef HAVE_INT16_T +#undef HAVE_INT32_T +#undef HAVE_INT64_T +#undef HAVE_U_INT8_T +#undef HAVE_U_INT16_T +#undef HAVE_U_INT32_T +#undef HAVE_U_INT64_T + +/* Maximum values on all known systems */ +#define MaxHostNameLen (64+4) +#define MaxPathLen (1024+4) + +])])
\ No newline at end of file diff --git a/crypto/heimdal/cf/retsigtype.m4 b/crypto/heimdal/cf/retsigtype.m4 new file mode 100644 index 0000000..4c3ecbd --- /dev/null +++ b/crypto/heimdal/cf/retsigtype.m4 @@ -0,0 +1,18 @@ +dnl +dnl $Id: retsigtype.m4,v 1.1 2000/07/15 18:05:56 joda Exp $ +dnl +dnl Figure out return type of signal handlers, and define SIGRETURN macro +dnl that can be used to return from one +dnl +AC_DEFUN(rk_RETSIGTYPE,[ +AC_TYPE_SIGNAL +if test "$ac_cv_type_signal" = "void" ; then + AC_DEFINE(VOID_RETSIGTYPE, 1, [Define if signal handlers return void.]) +fi +AC_SUBST(VOID_RETSIGTYPE) +AH_BOTTOM([#ifdef VOID_RETSIGTYPE +#define SIGRETURN(x) return +#else +#define SIGRETURN(x) return (RETSIGTYPE)(x) +#endif]) +])
\ No newline at end of file diff --git a/crypto/heimdal/cf/roken-frag.m4 b/crypto/heimdal/cf/roken-frag.m4 new file mode 100644 index 0000000..c6b552e --- /dev/null +++ b/crypto/heimdal/cf/roken-frag.m4 @@ -0,0 +1,586 @@ +dnl $Id: roken-frag.m4,v 1.19 2000/12/15 14:29:54 assar Exp $ +dnl +dnl some code to get roken working +dnl +dnl rk_ROKEN(subdir) +dnl +AC_DEFUN(rk_ROKEN, [ + +AC_REQUIRE([rk_CONFIG_HEADER]) + +DIR_roken=roken +LIB_roken='$(top_builddir)/$1/libroken.la' +INCLUDES_roken='-I$(top_builddir)/$1 -I$(top_srcdir)/$1' + +dnl Checks for programs +AC_REQUIRE([AC_PROG_CC]) +AC_REQUIRE([AC_PROG_AWK]) +AC_REQUIRE([AC_OBJEXT]) +AC_REQUIRE([AC_EXEEXT]) +AC_REQUIRE([AC_PROG_LIBTOOL]) + +AC_REQUIRE([AC_MIPS_ABI]) + +dnl C characteristics + +AC_REQUIRE([AC_C___ATTRIBUTE__]) +AC_REQUIRE([AC_C_INLINE]) +AC_REQUIRE([AC_C_CONST]) +AC_WFLAGS(-Wall -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast -Wmissing-declarations -Wnested-externs) + +AC_REQUIRE([rk_DB]) + +dnl C types + +AC_REQUIRE([AC_TYPE_SIZE_T]) +AC_CHECK_TYPE_EXTRA(ssize_t, int, [#include <unistd.h>]) +AC_REQUIRE([AC_TYPE_PID_T]) +AC_REQUIRE([AC_TYPE_UID_T]) +AC_HAVE_TYPE([long long]) + +AC_REQUIRE([rk_RETSIGTYPE]) + +dnl Checks for header files. +AC_REQUIRE([AC_HEADER_STDC]) +AC_REQUIRE([AC_HEADER_TIME]) + +AC_CHECK_HEADERS([\ + arpa/inet.h \ + arpa/nameser.h \ + config.h \ + crypt.h \ + dbm.h \ + db.h \ + dirent.h \ + errno.h \ + err.h \ + fcntl.h \ + gdbm/ndbm.h \ + grp.h \ + ifaddrs.h \ + ndbm.h \ + net/if.h \ + netdb.h \ + netinet/in.h \ + netinet/in6.h \ + netinet/in_systm.h \ + netinet6/in6.h \ + netinet6/in6_var.h \ + paths.h \ + pwd.h \ + resolv.h \ + rpcsvc/dbm.h \ + rpcsvc/ypclnt.h \ + shadow.h \ + sys/ioctl.h \ + sys/param.h \ + sys/proc.h \ + sys/resource.h \ + sys/socket.h \ + sys/sockio.h \ + sys/stat.h \ + sys/sysctl.h \ + sys/time.h \ + sys/tty.h \ + sys/types.h \ + sys/uio.h \ + sys/utsname.h \ + sys/wait.h \ + syslog.h \ + termios.h \ + unistd.h \ + userconf.h \ + usersec.h \ + util.h \ + vis.h \ + winsock.h \ +]) + +AC_REQUIRE([CHECK_NETINET_IP_AND_TCP]) + +AM_CONDITIONAL(have_err_h, test "$ac_cv_header_err_h" = yes) +AM_CONDITIONAL(have_fnmatch_h, test "$ac_cv_header_fnmatch_h" = yes) +AM_CONDITIONAL(have_ifaddrs_h, test "$ac_cv_header_ifaddrs_h" = yes) +AM_CONDITIONAL(have_vis_h, test "$ac_cv_header_vis_h" = yes) + +dnl Check for functions and libraries + +AC_KRB_IPV6 + +AC_FIND_FUNC(socket, socket) +AC_FIND_FUNC(gethostbyname, nsl) +AC_FIND_FUNC(syslog, syslog) +AC_FIND_FUNC(gethostbyname2, inet6 ip6) + +AC_FIND_FUNC(res_search, resolv, +[ +#include <stdio.h> +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H +#include <arpa/nameser.h> +#endif +#ifdef HAVE_RESOLV_H +#include <resolv.h> +#endif +], +[0,0,0,0,0]) + +AC_FIND_FUNC(dn_expand, resolv, +[ +#include <stdio.h> +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H +#include <arpa/nameser.h> +#endif +#ifdef HAVE_RESOLV_H +#include <resolv.h> +#endif +], +[0,0,0,0,0]) + +AC_BROKEN_SNPRINTF +AC_BROKEN_VSNPRINTF + +AC_BROKEN_GLOB +if test "$ac_cv_func_glob_working" != yes; then + LIBOBJS="$LIBOBJS glob.o" +fi +AM_CONDITIONAL(have_glob_h, test "$ac_cv_func_glob_working" = yes) + + +AC_CHECK_FUNCS([ \ + asnprintf \ + asprintf \ + cgetent \ + getconfattr \ + getrlimit \ + getspnam \ + strsvis \ + strunvis \ + strvis \ + strvisx \ + svis \ + sysconf \ + sysctl \ + uname \ + unvis \ + vasnprintf \ + vasprintf \ + vis \ +]) + +if test "$ac_cv_func_cgetent" = no; then + LIBOBJS="$LIBOBJS getcap.o" +fi + +AC_REQUIRE([AC_FUNC_GETLOGIN]) + +AC_FIND_FUNC_NO_LIBS(getsockopt,, +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif], +[0,0,0,0,0]) +AC_FIND_FUNC_NO_LIBS(setsockopt,, +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif], +[0,0,0,0,0]) + +AC_FIND_IF_NOT_BROKEN(hstrerror, resolv, +[#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif], +17) +if test "$ac_cv_func_hstrerror" = yes; then +AC_NEED_PROTO([ +#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif], +hstrerror) +fi + +dnl sigh, wish this could be done in a loop +if test "$ac_cv_func_asprintf" = yes; then +AC_NEED_PROTO([ +#include <stdio.h> +#include <string.h>], +asprintf)dnl +fi +if test "$ac_cv_func_vasprintf" = yes; then +AC_NEED_PROTO([ +#include <stdio.h> +#include <string.h>], +vasprintf)dnl +fi +if test "$ac_cv_func_asnprintf" = yes; then +AC_NEED_PROTO([ +#include <stdio.h> +#include <string.h>], +asnprintf)dnl +fi +if test "$ac_cv_func_vasnprintf" = yes; then +AC_NEED_PROTO([ +#include <stdio.h> +#include <string.h>], +vasnprintf)dnl +fi + +AC_FIND_FUNC_NO_LIBS(pidfile,util, +[#ifdef HAVE_UTIL_H +#include <util.h> +#endif],0) + +AC_BROKEN([ \ + chown \ + copyhostent \ + daemon \ + err \ + errx \ + fchown \ + flock \ + fnmatch \ + freeaddrinfo \ + freehostent \ + gai_strerror \ + getaddrinfo \ + getcwd \ + getdtablesize \ + getegid \ + geteuid \ + getgid \ + gethostname \ + getifaddrs \ + getipnodebyaddr \ + getipnodebyname \ + getnameinfo \ + getopt \ + gettimeofday \ + getuid \ + getusershell \ + initgroups \ + innetgr \ + iruserok \ + lstat \ + memmove \ + mkstemp \ + putenv \ + rcmd \ + readv \ + recvmsg \ + sendmsg \ + setegid \ + setenv \ + seteuid \ + strcasecmp \ + strdup \ + strerror \ + strftime \ + strlcat \ + strlcpy \ + strlwr \ + strncasecmp \ + strndup \ + strnlen \ + strptime \ + strsep \ + strsep_copy \ + strtok_r \ + strupr \ + swab \ + unsetenv \ + verr \ + verrx \ + vsyslog \ + vwarn \ + vwarnx \ + warn \ + warnx \ + writev \ +]) + +AC_BROKEN2(inet_aton, +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif], +[0,0]) + +AC_BROKEN2(inet_ntop, +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif], +[0, 0, 0, 0]) + +AC_BROKEN2(inet_pton, +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif], +[0,0,0]) + +dnl +dnl Check for sa_len in struct sockaddr, +dnl needs to come before the getnameinfo test +dnl +AC_HAVE_STRUCT_FIELD(struct sockaddr, sa_len, [#include <sys/types.h> +#include <sys/socket.h>]) + +if test "$ac_cv_func_getnameinfo" = "yes"; then + rk_BROKEN_GETNAMEINFO + if test "$ac_cv_func_getnameinfo_broken" = yes; then + LIBOBJS="$LIBOBJS getnameinfo.o" + fi +fi + +AC_NEED_PROTO([#include <stdlib.h>], setenv) +AC_NEED_PROTO([#include <stdlib.h>], unsetenv) +AC_NEED_PROTO([#include <unistd.h>], gethostname) +AC_NEED_PROTO([#include <unistd.h>], mkstemp) +AC_NEED_PROTO([#include <unistd.h>], getusershell) + +AC_NEED_PROTO([ +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif], +inet_aton) + +AC_FIND_FUNC_NO_LIBS(crypt, crypt)dnl + +AC_REQUIRE([rk_BROKEN_REALLOC])dnl + +dnl AC_KRB_FUNC_GETCWD_BROKEN + +dnl +dnl Checks for prototypes and declarations +dnl + +AC_PROTO_COMPAT([ +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif +], +gethostbyname, struct hostent *gethostbyname(const char *)) + +AC_PROTO_COMPAT([ +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif +], +gethostbyaddr, struct hostent *gethostbyaddr(const void *, size_t, int)) + +AC_PROTO_COMPAT([ +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif +], +getservbyname, struct servent *getservbyname(const char *, const char *)) + +AC_PROTO_COMPAT([ +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +], +getsockname, int getsockname(int, struct sockaddr*, socklen_t*)) + +AC_PROTO_COMPAT([ +#ifdef HAVE_SYSLOG_H +#include <syslog.h> +#endif +], +openlog, void openlog(const char *, int, int)) + +AC_NEED_PROTO([ +#ifdef HAVE_CRYPT_H +#include <crypt.h> +#endif +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +], +crypt) + +AC_NEED_PROTO([ +#include <string.h> +], +strtok_r) + +AC_NEED_PROTO([ +#include <string.h> +], +strsep) + +dnl variables + +rk_CHECK_VAR(h_errno, +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif]) + +rk_CHECK_VAR(h_errlist, +[#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif]) + +rk_CHECK_VAR(h_nerr, +[#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif]) + +rk_CHECK_VAR([__progname], +[#ifdef HAVE_ERR_H +#include <err.h> +#endif]) + +AC_CHECK_DECLARATION([#include <stdlib.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif], optarg) +AC_CHECK_DECLARATION([#include <stdlib.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif], optind) +AC_CHECK_DECLARATION([#include <stdlib.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif], opterr) +AC_CHECK_DECLARATION([#include <stdlib.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif], optopt) + +AC_CHECK_DECLARATION([#include <stdlib.h>], environ) + +dnl +dnl Check for fields in struct tm +dnl + +AC_HAVE_STRUCT_FIELD(struct tm, tm_gmtoff, [#include <time.h>]) +AC_HAVE_STRUCT_FIELD(struct tm, tm_zone, [#include <time.h>]) + +dnl +dnl or do we have a variable `timezone' ? +dnl + +rk_CHECK_VAR(timezone,[#include <time.h>]) + +AC_HAVE_TYPE([sa_family_t],[#include <sys/socket.h>]) +AC_HAVE_TYPE([socklen_t],[#include <sys/socket.h>]) +AC_HAVE_TYPE([struct sockaddr], [#include <sys/socket.h>]) +AC_HAVE_TYPE([struct sockaddr_storage], [#include <sys/socket.h>]) +AC_HAVE_TYPE([struct addrinfo], [#include <netdb.h>]) +AC_HAVE_TYPE([struct ifaddrs], [#include <ifaddrs.h>]) + +dnl +dnl Check for struct winsize +dnl + +AC_KRB_STRUCT_WINSIZE + +dnl +dnl Check for struct spwd +dnl + +AC_KRB_STRUCT_SPWD + +dnl won't work with automake +dnl moved to AC_OUTPUT in configure.in +dnl AC_CONFIG_FILES($1/Makefile) + +LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)" + +AC_SUBST(DIR_roken)dnl +AC_SUBST(LIB_roken)dnl +AC_SUBST(INCLUDES_roken)dnl +])
\ No newline at end of file diff --git a/crypto/heimdal/cf/roken.m4 b/crypto/heimdal/cf/roken.m4 new file mode 100644 index 0000000..f5a8678 --- /dev/null +++ b/crypto/heimdal/cf/roken.m4 @@ -0,0 +1,64 @@ +dnl $Id: roken.m4,v 1.2 2000/07/08 15:50:34 assar Exp $ +dnl +dnl try to look for an installed roken library with sufficient stuff +dnl +dnl set LIB_roken to the what we should link with +dnl set DIR_roken to if the directory should be built +dnl set CPPFLAGS_roken to stuff to add to CPPFLAGS + +dnl AC_ROKEN(version,directory-to-try,roken-dir,fallback-library,fallback-cppflags) +AC_DEFUN(AC_ROKEN, [ + +AC_ARG_WITH(roken, +[ --with-roken=dir use the roken library in dir], +[if test "$withval" = "no"; then + AC_MSG_ERROR(roken is required) +fi]) + +save_CPPFLAGS="${CPPFLAGS}" + +case $with_roken in +yes|"") + dirs="$2" ;; +*) + dirs="$with_roken" ;; +esac + +roken_installed=no + +for i in $dirs; do + +AC_MSG_CHECKING(for roken in $i) + +CPPFLAGS="-I$i/include ${CPPFLAGS}" + +AC_TRY_CPP( +[#include <roken.h> +#if ROKEN_VERSION < $1 +#error old roken version, should be $1 +fail +#endif +],[roken_installed=yes; break]) + +AC_MSG_RESULT($roken_installed) + +done + +CPPFLAGS="$save_CPPFLAGS" + +if test "$roken_installed" != "yes"; then + DIR_roken="roken" + LIB_roken='$4' + CPPFLAGS_roken='$5' + AC_CONFIG_SUBDIRS(lib/roken) +else + LIB_roken="$i/lib/libroken.la" + CPPFLAGS_roken="-I$i/include" +fi + +LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)" + +AC_SUBST(LIB_roken)dnl +AC_SUBST(DIR_roken)dnl +AC_SUBST(CPPFLAGS_roken)dnl +]) diff --git a/crypto/heimdal/cf/shared-libs.m4 b/crypto/heimdal/cf/shared-libs.m4 index 9fe576f..bddc121 100644 --- a/crypto/heimdal/cf/shared-libs.m4 +++ b/crypto/heimdal/cf/shared-libs.m4 @@ -1,5 +1,5 @@ dnl -dnl $Id: shared-libs.m4,v 1.4 1999/07/13 17:47:09 assar Exp $ +dnl $Id: shared-libs.m4,v 1.6 2000/11/17 02:59:27 assar Exp $ dnl dnl Shared library stuff has to be different everywhere dnl @@ -65,7 +65,7 @@ case "${host}" in install_symlink_command2='$(LN_S) -f $(LIB2) $(DESTDIR)$(libdir)/$(LIBNAME2).so.'"${SHLIB_SONAME}"';$(LN_S) -f $(LIB2) $(DESTDIR)$(libdir)/$(LIBNAME2).so' ;; changequote(,)dnl -*-*-freebsd[34]*) +*-*-freebsd[345]* | *-*-freebsdelf[345]*) changequote([,])dnl REAL_SHLIBEXT=so.$SHLIB_VERSION REAL_LD_FLAGS='-Wl,-R$(libdir)' @@ -84,9 +84,14 @@ changequote([,])dnl LDSHARED='ld -shared -expect_unresolved \*' ;; *-*-solaris2*) + LDSHARED='$(CC) -shared -Wl,-soname,$(LIBNAME).so.'"${SHLIB_SONAME}" + REAL_SHLIBEXT=so.$SHLIB_VERSION + build_symlink_command='$(LN_S) [$][@] $(LIBNAME).so' + install_symlink_command='$(LN_S) $(LIB) $(DESTDIR)$(libdir)/$(LIBNAME).so.'"${SHLIB_SONAME}"';$(LN_S) $(LIB) $(DESTDIR)$(libdir)/$(LIBNAME).so' + install_symlink_command2='$(LN_S) $(LIB2) $(DESTDIR)$(libdir)/$(LIBNAME2).so.'"${SHLIB_SONAME}"';$(LN_S) $(LIB2) $(DESTDIR)$(libdir)/$(LIBNAME2).so' REAL_LD_FLAGS='-Wl,-R$(libdir)' if test -z "$GCC"; then - LDSHARED='$(CC) -G' + LDSHARED='$(CC) -G -h$(LIBNAME).so.'"${SHLIB_SONAME}" REAL_PICFLAGS="-Kpic" fi ;; diff --git a/crypto/heimdal/cf/test-package.m4 b/crypto/heimdal/cf/test-package.m4 index 6bae158..6aac770 100644 --- a/crypto/heimdal/cf/test-package.m4 +++ b/crypto/heimdal/cf/test-package.m4 @@ -1,6 +1,6 @@ -dnl $Id: test-package.m4,v 1.7 1999/04/19 13:33:05 assar Exp $ +dnl $Id: test-package.m4,v 1.9 2000/12/15 04:54:24 assar Exp $ dnl -dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations) +dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations, conditional) AC_DEFUN(AC_TEST_PACKAGE,[AC_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)]) @@ -74,7 +74,9 @@ if test "$ires" -a "$lres" -a "$with_$1" != "no"; then $1_libdir="$lres" INCLUDE_$1="-I$$1_includedir" LIB_$1="-L$$1_libdir $3" - AC_DEFINE_UNQUOTED(upcase($1),1,[Define if you have the $1 package.]) + m4_ifval([$6], + AC_DEFINE_UNQUOTED($6,1,[Define if you have the $1 package.]), + AC_DEFINE_UNQUOTED(upcase($1),1,[Define if you have the $1 package.])) with_$1=yes AC_MSG_RESULT([headers $ires, libraries $lres]) else @@ -83,6 +85,9 @@ else with_$1=no AC_MSG_RESULT($with_$1) fi +dnl m4_ifval([$6], +dnl AM_CONDITIONAL($6, test "$with_$1" = yes) +dnl AM_CONDITIONAL(upcase($1), test "$with_$1" = yes)) AC_SUBST(INCLUDE_$1) AC_SUBST(LIB_$1) ]) |