From ca616c603d9e06e51c9e23fab7536acbdac58331 Mon Sep 17 00:00:00 2001 From: markm Date: Sun, 9 Jan 2000 08:31:47 +0000 Subject: Clean import of KTH Kerberos (eBones) v1.0. --- crypto/kerberosIV/cf/ChangeLog | 58 ++++++++++++++++++++++++++++++ crypto/kerberosIV/cf/Makefile.am.common | 8 ++--- crypto/kerberosIV/cf/capabilities.m4 | 14 ++++++++ crypto/kerberosIV/cf/check-x.m4 | 4 +-- crypto/kerberosIV/cf/find-func-no-libs.m4 | 6 ++-- crypto/kerberosIV/cf/find-func-no-libs2.m4 | 6 ++-- crypto/kerberosIV/cf/grok-type.m4 | 5 ++- crypto/kerberosIV/cf/have-struct-field.m4 | 6 ++-- crypto/kerberosIV/cf/have-type.m4 | 31 ++++++++++++++++ crypto/kerberosIV/cf/have-types.m4 | 14 ++++++++ crypto/kerberosIV/cf/krb-func-getlogin.m4 | 22 ++++++++++++ crypto/kerberosIV/cf/krb-struct-spwd.m4 | 4 +-- crypto/kerberosIV/cf/shared-libs.m4 | 7 ++-- 13 files changed, 164 insertions(+), 21 deletions(-) create mode 100644 crypto/kerberosIV/cf/capabilities.m4 create mode 100644 crypto/kerberosIV/cf/have-type.m4 create mode 100644 crypto/kerberosIV/cf/have-types.m4 create mode 100644 crypto/kerberosIV/cf/krb-func-getlogin.m4 (limited to 'crypto/kerberosIV/cf') diff --git a/crypto/kerberosIV/cf/ChangeLog b/crypto/kerberosIV/cf/ChangeLog index 8bc4d04..13d9bfd9 100644 --- a/crypto/kerberosIV/cf/ChangeLog +++ b/crypto/kerberosIV/cf/ChangeLog @@ -1,3 +1,61 @@ +1999-11-05 Assar Westerlund + + * check-x.m4: include X_PRE_LIBS and X_EXTRA_LIBS when testing + +1999-11-01 Assar Westerlund + + * Makefile.am.common (install-build-headers): use `cp' instead of + INSTALL_DATA for copying header files inside the build tree. The + user might have redefined INSTALL_DATA to specify owners and other + information. + +1999-10-30 Assar Westerlund + + * find-func-no-libs2.m4: add yet another argument to allow specify + linker flags that will be added _before_ the library when trying + to link + + * find-func-no-libs.m4: add yet another argument to allow specify + linker flags that will be added _before_ the library when trying + to link + +1999-10-12 Assar Westerlund + + * find-func-no-libs2.m4 (AC_FIND_FUNC_NO_LIBS2): new argument + `extra libs' + + * find-func-no-libs.m4 (AC_FIND_FUNC_NO_LIBS): new argument `extra + libs' + +1999-09-01 Johan Danielsson + + * capabilities.m4: sgi capabilities + +1999-07-29 Assar Westerlund + + * have-struct-field.m4: quote macros when undefining + +1999-07-28 Assar Westerlund + + * Makefile.am.common (install-build-headers): add dependencies + +1999-07-24 Assar Westerlund + + * have-type.m4: try to get autoheader to co-operate + + * have-type.m4: stolen from Arla + + * krb-struct-sockaddr-sa-len.m4: not used any longer. removed. + +1999-06-13 Assar Westerlund + + * krb-struct-spwd.m4: consequent name of cache variables + + * krb-func-getlogin.m4: new file for testing for posix (broken) + getlogin + + * shared-libs.m4 (freebsd[34]): don't use ld -Bshareable + 1999-06-02 Johan Danielsson * check-x.m4: extended test for X diff --git a/crypto/kerberosIV/cf/Makefile.am.common b/crypto/kerberosIV/cf/Makefile.am.common index af92746..e7d747b 100644 --- a/crypto/kerberosIV/cf/Makefile.am.common +++ b/crypto/kerberosIV/cf/Makefile.am.common @@ -1,4 +1,4 @@ -# $Id: Makefile.am.common,v 1.11 1999/05/26 08:42:55 assar Exp $ +# $Id: Makefile.am.common,v 1.13 1999/11/01 03:19:58 assar Exp $ AUTOMAKE_OPTIONS = foreign no-dependencies @@ -60,7 +60,7 @@ install-suid-programs: install-exec-hook: install-suid-programs -install-build-headers:: +install-build-headers:: $(include_HEADERS) $(build_HEADERZ) @foo='$(include_HEADERS) $(build_HEADERZ)'; \ for f in $$foo; do \ f=`basename $$f`; \ @@ -68,8 +68,8 @@ install-build-headers:: else file="$$f"; fi; \ if cmp -s $$file $(buildinclude)/$$f 2> /dev/null ; then \ : ; else \ - echo " $(INSTALL_DATA) $$file $(buildinclude)/$$f"; \ - $(INSTALL_DATA) $$file $(buildinclude)/$$f; \ + echo " cp $$file $(buildinclude)/$$f"; \ + cp $$file $(buildinclude)/$$f; \ fi ; \ done diff --git a/crypto/kerberosIV/cf/capabilities.m4 b/crypto/kerberosIV/cf/capabilities.m4 new file mode 100644 index 0000000..6d2669b --- /dev/null +++ b/crypto/kerberosIV/cf/capabilities.m4 @@ -0,0 +1,14 @@ +dnl +dnl $Id: capabilities.m4,v 1.2 1999/09/01 11:02:26 joda Exp $ +dnl + +dnl +dnl Test SGI capabilities +dnl + +AC_DEFUN(KRB_CAPABILITIES,[ + +AC_CHECK_HEADERS(capability.h sys/capability.h) + +AC_CHECK_FUNCS(sgi_getcapabilitybyname cap_set_proc) +]) diff --git a/crypto/kerberosIV/cf/check-x.m4 b/crypto/kerberosIV/cf/check-x.m4 index 2635e7d..1791e5a 100644 --- a/crypto/kerberosIV/cf/check-x.m4 +++ b/crypto/kerberosIV/cf/check-x.m4 @@ -1,7 +1,7 @@ dnl dnl See if there is any X11 present dnl -dnl $Id: check-x.m4,v 1.1 1999/06/03 00:22:10 joda Exp $ +dnl $Id: check-x.m4,v 1.2 1999/11/05 04:25:23 assar Exp $ AC_DEFUN(KRB_CHECK_X,[ AC_PATH_XTRA @@ -31,7 +31,7 @@ if test "$no_x" != yes; then esac done fi - LIBS="$ac_save_libs $foo -lX11" + LIBS="$ac_save_libs $foo $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" AC_TRY_RUN([ #include foo() diff --git a/crypto/kerberosIV/cf/find-func-no-libs.m4 b/crypto/kerberosIV/cf/find-func-no-libs.m4 index a239742..3deab02 100644 --- a/crypto/kerberosIV/cf/find-func-no-libs.m4 +++ b/crypto/kerberosIV/cf/find-func-no-libs.m4 @@ -1,9 +1,9 @@ -dnl $Id: find-func-no-libs.m4,v 1.3 1998/06/04 02:06:50 assar Exp $ +dnl $Id: find-func-no-libs.m4,v 1.5 1999/10/30 21:08:18 assar Exp $ dnl dnl dnl Look for function in any of the specified libraries dnl -dnl AC_FIND_FUNC_NO_LIBS(func, libraries, includes, arguments) +dnl AC_FIND_FUNC_NO_LIBS(func, libraries, includes, arguments, extra libs, extra args) AC_DEFUN(AC_FIND_FUNC_NO_LIBS, [ -AC_FIND_FUNC_NO_LIBS2([$1], ["" $2], [$3], [$4])]) +AC_FIND_FUNC_NO_LIBS2([$1], ["" $2], [$3], [$4], [$5], [$6])]) diff --git a/crypto/kerberosIV/cf/find-func-no-libs2.m4 b/crypto/kerberosIV/cf/find-func-no-libs2.m4 index d5896cf..c404a7c 100644 --- a/crypto/kerberosIV/cf/find-func-no-libs2.m4 +++ b/crypto/kerberosIV/cf/find-func-no-libs2.m4 @@ -1,10 +1,10 @@ -dnl $Id: find-func-no-libs2.m4,v 1.1 1998/06/04 02:07:12 assar Exp $ +dnl $Id: find-func-no-libs2.m4,v 1.3 1999/10/30 21:09:53 assar Exp $ dnl dnl dnl Look for function in any of the specified libraries dnl -dnl AC_FIND_FUNC_NO_LIBS2(func, libraries, includes, arguments) +dnl AC_FIND_FUNC_NO_LIBS2(func, libraries, includes, arguments, extra libs, extra args) AC_DEFUN(AC_FIND_FUNC_NO_LIBS2, [ AC_MSG_CHECKING([for $1]) @@ -18,7 +18,7 @@ if eval "test \"\$ac_cv_func_$1\" != yes" ; then else ac_lib="" fi - LIBS="$ac_lib $ac_save_LIBS" + LIBS="$6 $ac_lib $5 $ac_save_LIBS" AC_TRY_LINK([$3],[$1($4)],eval "if test -n \"$ac_lib\";then ac_cv_funclib_$1=$ac_lib; else ac_cv_funclib_$1=yes; fi";break) done eval "ac_cv_funclib_$1=\${ac_cv_funclib_$1-no}" diff --git a/crypto/kerberosIV/cf/grok-type.m4 b/crypto/kerberosIV/cf/grok-type.m4 index e74c6cf..5bc6a66 100644 --- a/crypto/kerberosIV/cf/grok-type.m4 +++ b/crypto/kerberosIV/cf/grok-type.m4 @@ -1,8 +1,11 @@ -dnl $Id: grok-type.m4,v 1.3 1999/03/21 18:59:56 joda Exp $ +dnl $Id: grok-type.m4,v 1.4 1999/11/29 11:16:48 joda Exp $ dnl AC_DEFUN(AC_GROK_TYPE, [ AC_CACHE_VAL(ac_cv_type_$1, AC_TRY_COMPILE([ +#ifdef HAVE_INTTYPES_H +#include +#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/crypto/kerberosIV/cf/have-struct-field.m4 b/crypto/kerberosIV/cf/have-struct-field.m4 index f44b036..88ad5c3 100644 --- a/crypto/kerberosIV/cf/have-struct-field.m4 +++ b/crypto/kerberosIV/cf/have-struct-field.m4 @@ -1,4 +1,4 @@ -dnl $Id: have-struct-field.m4,v 1.5 1999/03/01 13:10:35 joda Exp $ +dnl $Id: have-struct-field.m4,v 1.6 1999/07/29 01:44:32 assar Exp $ dnl dnl check for fields in a structure dnl @@ -13,7 +13,7 @@ cache_val=no)]) if test "$cache_val" = yes; then define(foo, translit(HAVE_$1_$2, [a-z ], [A-Z_])) AC_DEFINE(foo, 1, [Define if $1 has field $2.]) - undefine(foo) + undefine([foo]) fi -undefine(cache_val) +undefine([cache_val]) ]) diff --git a/crypto/kerberosIV/cf/have-type.m4 b/crypto/kerberosIV/cf/have-type.m4 new file mode 100644 index 0000000..7963355 --- /dev/null +++ b/crypto/kerberosIV/cf/have-type.m4 @@ -0,0 +1,31 @@ +dnl $Id: have-type.m4,v 1.4 1999/07/24 19:23:01 assar Exp $ +dnl +dnl check for existance of a type + +dnl AC_HAVE_TYPE(TYPE,INCLUDES) +AC_DEFUN(AC_HAVE_TYPE, [ +cv=`echo "$1" | sed 'y%./+- %__p__%'` +AC_MSG_CHECKING(for $1) +AC_CACHE_VAL([ac_cv_type_$cv], +AC_TRY_COMPILE( +[#include +#if STDC_HEADERS +#include +#include +#endif +$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_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) +fi +]) diff --git a/crypto/kerberosIV/cf/have-types.m4 b/crypto/kerberosIV/cf/have-types.m4 new file mode 100644 index 0000000..7c85c5d --- /dev/null +++ b/crypto/kerberosIV/cf/have-types.m4 @@ -0,0 +1,14 @@ +dnl +dnl $Id: have-types.m4,v 1.1 1999/07/24 18:38:58 assar 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 +]) diff --git a/crypto/kerberosIV/cf/krb-func-getlogin.m4 b/crypto/kerberosIV/cf/krb-func-getlogin.m4 new file mode 100644 index 0000000..921c5ab --- /dev/null +++ b/crypto/kerberosIV/cf/krb-func-getlogin.m4 @@ -0,0 +1,22 @@ +dnl +dnl $Id: krb-func-getlogin.m4,v 1.1 1999/07/13 17:45:30 assar Exp $ +dnl +dnl test for POSIX (broken) getlogin +dnl + + +AC_DEFUN(AC_FUNC_GETLOGIN, [ +AC_CHECK_FUNCS(getlogin setlogin) +if test "$ac_cv_func_getlogin" = yes; then +AC_CACHE_CHECK(if getlogin is posix, ac_cv_func_getlogin_posix, [ +if test "$ac_cv_func_getlogin" = yes -a "$ac_cv_func_setlogin" = yes; then + ac_cv_func_getlogin_posix=no +else + ac_cv_func_getlogin_posix=yes +fi +]) +if test "$ac_cv_func_getlogin_posix" = yes; then + AC_DEFINE(POSIX_GETLOGIN, 1, [Define if getlogin has POSIX flavour (and not BSD).]) +fi +fi +]) diff --git a/crypto/kerberosIV/cf/krb-struct-spwd.m4 b/crypto/kerberosIV/cf/krb-struct-spwd.m4 index c088129..4ab81fd 100644 --- a/crypto/kerberosIV/cf/krb-struct-spwd.m4 +++ b/crypto/kerberosIV/cf/krb-struct-spwd.m4 @@ -1,10 +1,10 @@ -dnl $Id +dnl $Id: krb-struct-spwd.m4,v 1.3 1999/07/13 21:04:11 assar Exp $ dnl dnl Test for `struct spwd' AC_DEFUN(AC_KRB_STRUCT_SPWD, [ AC_MSG_CHECKING(for struct spwd) -AC_CACHE_VAL(ac_cv_type_struct_spwd, [ +AC_CACHE_VAL(ac_cv_struct_spwd, [ AC_TRY_COMPILE( [#include #ifdef HAVE_SHADOW_H diff --git a/crypto/kerberosIV/cf/shared-libs.m4 b/crypto/kerberosIV/cf/shared-libs.m4 index ffc3603..9fe576f 100644 --- a/crypto/kerberosIV/cf/shared-libs.m4 +++ b/crypto/kerberosIV/cf/shared-libs.m4 @@ -1,5 +1,5 @@ dnl -dnl $Id: shared-libs.m4,v 1.3 1999/04/09 15:34:25 assar Exp $ +dnl $Id: shared-libs.m4,v 1.4 1999/07/13 17:47:09 assar Exp $ dnl dnl Shared library stuff has to be different everywhere dnl @@ -64,9 +64,10 @@ case "${host}" in install_symlink_command='$(LN_S) -f $(LIB) $(DESTDIR)$(libdir)/$(LIBNAME).so.'"${SHLIB_SONAME}"';$(LN_S) -f $(LIB) $(DESTDIR)$(libdir)/$(LIBNAME).so' install_symlink_command2='$(LN_S) -f $(LIB2) $(DESTDIR)$(libdir)/$(LIBNAME2).so.'"${SHLIB_SONAME}"';$(LN_S) -f $(LIB2) $(DESTDIR)$(libdir)/$(LIBNAME2).so' ;; -*-*-freebsd3*) +changequote(,)dnl +*-*-freebsd[34]*) +changequote([,])dnl REAL_SHLIBEXT=so.$SHLIB_VERSION - LDSHARED='ld -Bshareable' REAL_LD_FLAGS='-Wl,-R$(libdir)' build_symlink_command='$(LN_S) -f [$][@] $(LIBNAME).so' install_symlink_command='$(LN_S) -f $(LIB) $(DESTDIR)$(libdir)/$(LIBNAME).so' -- cgit v1.1