update to automake 1.4/autoconf 2.13

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5460 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-03-01 09:52:24 +00:00
parent c028bd28e8
commit e20466bcab
18 changed files with 59 additions and 337 deletions

@ -1,8 +1,5 @@
@BOTTOM@
#undef VERSION
#undef PACKAGE
#undef BINDIR
#undef LIBDIR
#undef LIBEXECDIR
@ -25,164 +22,12 @@
#define KRB_PUT_INT(F, T, L, S) krb_put_int((F), (T), (L))
#endif
/* Define this to the type ssize_t should be */
#undef ssize_t
/* Define this to the type sig_atomic_t should be */
#undef sig_atomic_t
/* Define this to the type mode_t should be */
#undef mode_t
/* Define this if struct utmp have ut_user */
#undef HAVE_UT_USER
/* Define this if struct utmp have ut_host */
#undef HAVE_UT_HOST
/* Define this if struct utmp have ut_addr */
#undef HAVE_UT_ADDR
/* Define this if struct utmp have ut_type */
#undef HAVE_UT_TYPE
/* Define this if struct utmp have ut_pid */
#undef HAVE_UT_PID
/* Define this if struct utmp have ut_id */
#undef HAVE_UT_ID
/* Define this if struct utmpx have ut_syslen */
#undef HAVE_UT_SYSLEN
/* Define this if struct utmpx have ut_exit */
#undef HAVE_UT_EXIT
/* Define this if you have a IPv6 */
#undef HAVE_IPV6
/* define if prototype of gethostbyname is compatible with
`struct hostent *gethostbyname(const char *)
*/
#undef GETHOSTBYNAME_PROTO_COMPATIBLE
/* define if prototype of gethostbyaddr is compatible with
`struct hostent *gethostbyaddr(const void *, size_t, int)
*/
#undef GETHOSTBYADDR_PROTO_COMPATIBLE
/* define if prototype of getservbyname is compatible with
`struct servent *getservbyname(const char *, const char *)
*/
#undef GETSERVBYNAME_PROTO_COMPATIBLE
/* define if prototype of openlog is compatible with
`void openlog(const char *, int, int)'
*/
#undef OPENLOG_PROTO_COMPATIBLE
/* define if you have h_errno */
#undef HAVE_H_ERRNO
/* define if you have h_errlist but not hstrerror */
#undef HAVE_H_ERRLIST
/* define if you have h_nerr but not hstrerror */
#undef HAVE_H_NERR
/* define if your system doesn't declare h_errlist */
#undef HAVE_H_ERRLIST_DECLARATION
/* define if your system doesn't declare h_nerr */
#undef HAVE_H_NERR_DECLARATION
/* define this if you need a declaration for h_errno */
#undef HAVE_H_ERRNO_DECLARATION
/* define if you need a declaration for optarg */
#undef HAVE_OPTARG_DECLARATION
/* define if you need a declaration for optind */
#undef HAVE_OPTIND_DECLARATION
/* define if you need a declaration for opterr */
#undef HAVE_OPTERR_DECLARATION
/* define if you need a declaration for optopt */
#undef HAVE_OPTOPT_DECLARATION
/* define if you need a declaration for environ */
#undef HAVE_ENVIRON_DECLARATION
/* define if you need a declaration for __progname */
#undef HAVE___PROGNAME_DECLARATION
/* define if the system is missing a prototype for crypt() */
#undef NEED_CRYPT_PROTO
/* define if the system is missing a prototype for strtok_r() */
#undef NEED_STRTOK_R_PROTO
/* define if the system is missing a prototype for getusershell() */
#undef NEED_GETUSERSHELL_PROTO
/* define if the system is missing a prototype for strtok_r() */
#undef NEED_HSTRERROR_PROTO
/* define if the system is missing a prototype for snprintf() */
#undef NEED_SNPRINTF_PROTO
/* define if the system is missing a prototype for vsnprintf() */
#undef NEED_VSNPRINTF_PROTO
/* define if the system is missing a prototype for asnprintf() */
#undef NEED_ASNPRINTF_PROTO
/* define if the system is missing a prototype for asprintf() */
#undef NEED_ASPRINTF_PROTO
/* define if the system is missing a prototype for vasnprintf() */
#undef NEED_VASNPRINTF_PROTO
/* define if the system is missing a prototype for vasprintf() */
#undef NEED_VASPRINTF_PROTO
/* define if the system is missing a prototype for gethostname() */
#undef NEED_GETHOSTNAME_PROTO
/* define if the system is missing a prototype for inet_aton() */
#undef NEED_INET_ATON_PROTO
/* define if the system is missing a prototype for mkstemp() */
#undef NEED_MKSTEMP_PROTO
/* define if the system is missing a prototype for glob() */
#undef NEED_GLOB_PROTO
/* Define this if your `struct tm' has a field `tm_gmtoff' */
#undef HAVE_STRUCT_TM_TM_GMTOFF
/* define if getcwd() is broken (such as in SunOS) */
#undef BROKEN_GETCWD
/* Define this if you have a variable `timezone' */
#undef HAVE_TIMEZONE
/* Define this if you have a struct spwd */
#undef HAVE_STRUCT_SPWD
/* Define this if struct winsize is declared in sys/termios.h */
#undef HAVE_STRUCT_WINSIZE
/* Define this if struct winsize has ws_xpixel */
#undef HAVE_WS_XPIXEL
/* Define this if struct winsize has ws_ypixel */
#undef HAVE_WS_YPIXEL
/* Define this if struct sockaddr has sa_len */
#undef SOCKADDR_HAS_SA_LEN
/* Define to isoc_realloc if you have a broken realloc */
#undef BROKEN_REALLOC
#ifdef BROKEN_REALLOC
@ -201,12 +46,6 @@
/* Define if you have a readline compatible library */
#undef HAVE_READLINE
/* define if el_init takes four arguments */
#undef HAVE_FOUR_VALUED_EL_INIT
/* Define if you have hesiod */
#undef HESIOD
#define RCSID(msg) \
static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
@ -233,9 +72,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
/* define this for OTP support */
#undef OTP
/* define this if you have kerberos 4 */
#undef KRB4
/* define this if you want to use the KDC as a kaserver */
#undef KASERVER
@ -255,9 +91,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#define AUTHENTICATION 1
#endif
/* Define if you have hesiod */
#undef HESIOD
/* define if you want key-deriving des3 code */
#undef NEW_DES3_CODE

@ -10,12 +10,10 @@ AC_TRY_LINK([
#include <glob.h>],[
glob(NULL, GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE, NULL, NULL);
],:,ac_cv_func_glob_working=no,:))
: << END
@@@funcs="$funcs glob"@@@
END
if test "$ac_cv_func_glob_working" = yes; then
foo=HAVE_GLOB
AC_DEFINE_UNQUOTED($foo)
AC_DEFINE(HAVE_GLOB, 1, [define if you have a glob() that groks
GLOB_BRACE, GLOB_NOCHECK, GLOB_QUOTE, and GLOB_TILDE])
fi
if test "$ac_cv_func_glob_working" = yes; then
AC_NEED_PROTO([#include <stdio.h>

@ -14,12 +14,9 @@ changequote([,])dnl
snprintf(foo, 2, "12");
return strcmp(foo, "1");
}],:,ac_cv_func_snprintf_working=no,:))
: << END
@@@funcs="$funcs snprintf"@@@
END
if test "$ac_cv_func_snprintf_working" = yes; then
foo=HAVE_SNPRINTF
AC_DEFINE_UNQUOTED($foo)
AC_DEFINE_UNQUOTED(HAVE_SNPRINTF, 1, [define if you have a working snprintf])
fi
if test "$ac_cv_func_snprintf_working" = yes; then
AC_NEED_PROTO([#include <stdio.h>],snprintf)
@ -51,12 +48,9 @@ int main()
{
return foo(0, "12");
}],:,ac_cv_func_vsnprintf_working=no,:))
: << END
@@@funcs="$funcs vsnprintf"@@@
END
if test "$ac_cv_func_vsnprintf_working" = yes; then
foo=HAVE_VSNPRINTF
AC_DEFINE_UNQUOTED($foo)
AC_DEFINE_UNQUOTED(HAVE_VSNPRINTF, 1, [define if you have a working vsnprintf])
fi
if test "$ac_cv_func_vsnprintf_working" = yes; then
AC_NEED_PROTO([#include <stdio.h>],vsnprintf)

@ -24,7 +24,7 @@ foo(void)
ac_cv___attribute__=yes,
ac_cv___attribute__=no)])
if test "$ac_cv___attribute__" = "yes"; then
AC_DEFINE(HAVE___ATTRIBUTE__)
AC_DEFINE(HAVE___ATTRIBUTE__, 1, [define if your compiler has __attribute__])
fi
AC_MSG_RESULT($ac_cv___attribute__)
])

@ -26,7 +26,7 @@ ac_cv___function__=yes,
ac_cv___function__=no,
ac_cv___function__=no)])
if test "$ac_cv___function__" = "yes"; then
AC_DEFINE(HAVE___FUNCTION__)
AC_DEFINE(HAVE___FUNCTION__, 1, [define if your compiler has __FUNCTION__])
fi
AC_MSG_RESULT($ac_cv___function__)
])

@ -15,16 +15,11 @@ eval "ac_cv_var_$2_declaration=no",
eval "ac_cv_var_$2_declaration=yes")
])
ac_tr_var=[HAVE_]translit($2, [a-z], [A-Z])[_DECLARATION]
define([foo], [HAVE_]translit($2, [a-z], [A-Z])[_DECLARATION])
: << END
@@@syms="$syms foo"@@@
END
undefine([foo])
define(foo, [HAVE_]translit($2, [a-z], [A-Z])[_DECLARATION])
AC_MSG_RESULT($ac_cv_var_$2_declaration)
if eval "test \"\$ac_cv_var_$2_declaration\" = yes"; then
AC_DEFINE_UNQUOTED($ac_tr_var)
AC_DEFINE(foo, 1, [define if your system declares $2])
fi
undef(foo)
])

@ -18,6 +18,6 @@ changequote([,]), [#include <sys/types.h>
$3], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
AC_MSG_RESULT($ac_cv_type_$1)
if test $ac_cv_type_$1 = no; then
AC_DEFINE($1, $2)
AC_DEFINE($1, $2, [Define this to what the type $1 should be.])
fi
])

@ -9,17 +9,12 @@ int foo() { return $2; }],
[foo()],
ac_cv_var_$2=yes, ac_cv_var_$2=no)
])
eval "ac_tr_var=[HAVE_]translit($2,[a-z],[A-Z])"
define([foo], [HAVE_]translit($2, [a-z], [A-Z]))
: << END
@@@syms="$syms foo"@@@
END
undefine([foo])
AC_MSG_RESULT(`eval echo \\$ac_cv_var_$2`)
if test `eval echo \\$ac_cv_var_$2` = yes; then
AC_DEFINE_UNQUOTED($ac_tr_var)
AC_DEFINE_UNQUOTED(foo, 1, [define if you have $2])
AC_CHECK_DECLARATION([$1],[$2])
fi
undefine([foo])
])

@ -1,30 +1,18 @@
dnl $Id$
dnl
dnl check for fields in a structure
dnl
dnl Check if a particular struct has a particular field
dnl
dnl AC_HAVE_STRUCT_FIELD(struct, field, headers)
dnl AC_HAVE_STRUCT_FIELD(includes, struct, type, field)
AC_DEFUN(AC_HAVE_STRUCT_FIELD, [
AC_MSG_CHECKING([if $2 has a field $4])
AC_CACHE_VAL(ac_cv_struct_$2_$4, [
AC_TRY_COMPILE([$1],
[struct $2 foo; $3 bar = foo.$4; ],
eval "ac_cv_struct_$2_$4=yes",
eval "ac_cv_struct_$2_$4=no")
])
changequote(, )dnl
eval "ac_tr_var=HAVE_STRUCT_[]upcase($2)_[]upcase($4)"
changequote([, ])dnl
define([foo], [[HAVE_STRUCT_]translit($2, [a-z], [A-Z])[_]translit($4, [a-z], [A-Z])])
: << END
@@@syms="$syms foo"@@@
END
undefine([foo])
AC_MSG_RESULT($ac_cv_struct_$2_$4)
if eval "test \"\$ac_cv_struct_$2_$4\" = yes"; then
AC_DEFINE_UNQUOTED($ac_tr_var)
AC_CACHE_CHECK([for $2 in $1], ac_cv_type_$1_$2,[
AC_TRY_COMPILE([$3],[$1 x; x.$2;],
ac_cv_type_$1_$2=yes,
ac_cv_type_$1_$2=no)])
if test "$ac_cv_type_$1_$2" = yes; then
define(foo, [HAVE_STRUCT_]translit($1_$2, [a-z ], [A-Z_]))
AC_DEFINE(foo, 1, [Define if $1 has field $2.])
undefine(foo)
fi
AC_MSG_RESULT($ac_cv_type_$1_$2)
])

@ -17,6 +17,6 @@ ac_cv_struct_spwd=no)
AC_MSG_RESULT($ac_cv_struct_spwd)
if test "$ac_cv_struct_spwd" = "yes"; then
AC_DEFINE(HAVE_STRUCT_SPWD)
AC_DEFINE(HAVE_STRUCT_SPWD, 1, [define if you have struct spwd])
fi
])

@ -17,9 +17,11 @@ $i, ac_cv_struct_winsize=yes; break)dnl
done
])
if test "$ac_cv_struct_winsize" = "yes"; then
AC_DEFINE(HAVE_STRUCT_WINSIZE, 1)dnl
AC_DEFINE(HAVE_STRUCT_WINSIZE, 1, [define if struct winsize is declared in sys/termios.h])
fi
AC_MSG_RESULT($ac_cv_struct_winsize)
AC_EGREP_HEADER(ws_xpixel, termios.h, AC_DEFINE(HAVE_WS_XPIXEL))
AC_EGREP_HEADER(ws_ypixel, termios.h, AC_DEFINE(HAVE_WS_YPIXEL))
AC_EGREP_HEADER(ws_xpixel, termios.h,
AC_DEFINE(HAVE_WS_XPIXEL, 1, [define if struct winsize has ws_xpixel]))
AC_EGREP_HEADER(ws_ypixel, termios.h,
AC_DEFINE(HAVE_WS_YPIXEL, 1, [define if struct winsize has ws_ypixel]))
])

@ -1,30 +0,0 @@
dnl $Id$
dnl
dnl
dnl Check if we need the declaration of a variable
dnl
AC_DEFUN(AC_NEED_DECLARATION, [
AC_MSG_CHECKING([if $3 needs a declaration])
AC_CACHE_VAL(ac_cv_var_$3_declaration, [
AC_TRY_COMPILE([$1],
[$2 foo = ($2)$3; ],
eval "ac_cv_var_$3_declaration=no",
eval "ac_cv_var_$3_declaration=yes")
])
changequote(, )dnl
eval "ac_tr_var=NEED_[]upcase($3)[]_DECLARATION"
changequote([, ])dnl
define([foo], [NEED_]translit($3, [a-z], [A-Z])[_DECLARATION])
: << END
@@@syms="$syms foo"@@@
END
undefine([foo])
AC_MSG_RESULT($ac_cv_var_$3_declaration)
if eval "test \"\$ac_cv_var_$3_declaration\" = yes"; then
AC_DEFINE_UNQUOTED($ac_tr_var)
fi
])

@ -7,6 +7,7 @@ dnl
dnl AC_NEED_PROTO(includes, function)
AC_DEFUN(AC_NEED_PROTO, [
if test "$ac_cv_func_$2+set" != set -o "$ac_cv_func_$2" = yes; then
AC_CACHE_CHECK([if $2 needs a prototype], ac_cv_func_$2_noproto,
AC_TRY_COMPILE([$1],
[struct foo { int foo; } xx;
@ -17,10 +18,8 @@ eval "ac_cv_func_$2_noproto=yes",
eval "ac_cv_func_$2_noproto=no"))
define([foo], [NEED_]translit($2, [a-z], [A-Z])[_PROTO])
if test "$ac_cv_func_$2_noproto" = yes; then
AC_DEFINE(foo)
AC_DEFINE(foo, 1, [define if the system is missing a prototype for $2()])
fi
: << END
@@@syms="$syms foo"@@@
END
undefine([foo])
fi
])

@ -15,10 +15,9 @@ eval "ac_cv_func_$2_proto_compat=yes",
eval "ac_cv_func_$2_proto_compat=no"))
define([foo], translit($2, [a-z], [A-Z])[_PROTO_COMPATIBLE])
if test "$ac_cv_func_$2_proto_compat" = yes; then
AC_DEFINE(foo)
AC_DEFINE(foo, 1, [define if prototype of openlog is compatible with
$3])
)
fi
: << END
@@@syms="$syms foo"@@@
END
undefine([foo])
])

@ -28,10 +28,6 @@ fi]
)
define([foo], translit($1, [a-z], [A-Z]))
: << END
@@@syms="$syms foo"@@@
END
if test -n "$with_$1" -o -n "$5"; then
dnl AC_DEFINE([foo])
if test -n "$with_$1" -a "$with_$1" != "yes"; then
@ -94,7 +90,7 @@ dnl Try to find lib
fi
if test -n "$$1_include" -o -n "$$1_lib"; then
AC_MSG_RESULT([headers $$1_include, libraries $$1_lib])
AC_DEFINE_UNQUOTED(foo)
AC_DEFINE_UNQUOTED(foo, 1, [Define if you have the $1 package])
if test "$with_$1" = "" -a "$5"; then
with_$1="$5"
fi

@ -1,17 +0,0 @@
dnl $Id$
dnl
dnl test for mode_t
AC_DEFUN(AC_TYPE_MODE_T,
[AC_MSG_CHECKING(for mode_t)
AC_CACHE_VAL(ac_cv_type_mode_t,
AC_TRY_COMPILE(
[#include <sys/types.h>],
[mode_t foo = 1;],
ac_cv_type_mode_t=yes,
ac_cv_type_mode_t=no))
if test "$ac_cv_type_mode_t" = no; then
AC_DEFINE(mode_t, unsigned short)dnl
fi
AC_MSG_RESULT($ac_cv_type_mode_t)
])

@ -1,17 +0,0 @@
dnl $Id$
dnl
dnl test for sig_atomic_t
AC_DEFUN(AC_TYPE_SIG_ATOMIC_T,
[AC_MSG_CHECKING(for sig_atomic_t)
AC_CACHE_VAL(ac_cv_type_sig_atomic_t,
AC_TRY_COMPILE(
[#include <signal.h>],
[sig_atomic_t foo = 1;],
ac_cv_type_sig_atomic_t=yes,
ac_cv_type_sig_atomic_t=no))
if test "$ac_cv_type_sig_atomic_t" = no; then
AC_DEFINE(sig_atomic_t, int)dnl
fi
AC_MSG_RESULT($ac_cv_type_sig_atomic_t)
])

@ -57,7 +57,6 @@ fi
AC_TEST_PACKAGE(krb4,krb.h,libkrb.a,-lkrb,/usr/athena)
if test "$with_krb4"; then
AC_DEFINE(KRB4, 1)
LIB_krb4="$KRB4LIB -ldes"
INCLUDE_krb4="$KRB4INCLUDE"
EXTRA_LIB45=lib45.a
@ -254,12 +253,11 @@ dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_OFF_T
AC_TYPE_SIZE_T
AC_CHECK_TYPE_EXTRA(ssize_t, int, [#include <unistd.h>
foo])
AC_CHECK_TYPE_EXTRA(ssize_t, int, [#include <unistd.h>])
AC_TYPE_PID_T
AC_TYPE_UID_T
AC_TYPE_MODE_T
AC_TYPE_SIG_ATOMIC_T
AC_CHECK_TYPE_EXTRA(mode_t, unsigned short, [])
AC_CHECK_TYPE_EXTRA(sig_atomic_t, int, [#include <signal.h>])
AC_HEADER_TIME
AC_STRUCT_TM
@ -432,24 +430,12 @@ AC_BROKEN(strcasecmp strncasecmp strdup strerror strftime strlwr strnlen)
AC_BROKEN(strsep strtok_r strupr swab unsetenv verr verrx vsyslog)
AC_BROKEN(vwarn vwarnx warn warnx writev)
if test "$ac_cv_func_gethostname" = "yes"; then
AC_NEED_PROTO([
#include <unistd.h>],
gethostname)
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)
if test "$ac_cv_func_mkstemp" = "yes"; then
AC_NEED_PROTO([
#include <unistd.h>],
mkstemp)
fi
AC_NEED_PROTO([
#include <unistd.h>
],
getusershell)
if test "$ac_cv_func_inet_aton" = "yes"; then
AC_NEED_PROTO([
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@ -464,7 +450,6 @@ AC_NEED_PROTO([
#include <arpa/inet.h>
#endif],
inet_aton)
fi
AC_FIND_FUNC_NO_LIBS(crypt, crypt)dnl
@ -601,14 +586,15 @@ AC_CHECK_DECLARATION([#include <stdlib.h>], environ)
dnl
dnl Check for fields in struct utmp
dnl
AC_EGREP_HEADER(ut_user, utmp.h, AC_DEFINE(HAVE_UT_USER))
AC_EGREP_HEADER(ut_host, utmp.h, AC_DEFINE(HAVE_UT_HOST))
AC_EGREP_HEADER(ut_addr, utmp.h, AC_DEFINE(HAVE_UT_ADDR))
AC_EGREP_HEADER(ut_type, utmp.h, AC_DEFINE(HAVE_UT_TYPE))
AC_EGREP_HEADER(ut_pid, utmp.h, AC_DEFINE(HAVE_UT_PID))
AC_EGREP_HEADER(ut_id, utmp.h, AC_DEFINE(HAVE_UT_ID))
AC_EGREP_HEADER(ut_syslen, utmpx.h, AC_DEFINE(HAVE_UT_SYSLEN))
AC_EGREP_HEADER(ut_exit, utmpx.h, AC_DEFINE(HAVE_UT_EXIT))
AC_HAVE_STRUCT_FIELD(utmp, ut_addr, [#include <utmp.h>])
AC_HAVE_STRUCT_FIELD(utmp, ut_host, [#include <utmp.h>])
AC_HAVE_STRUCT_FIELD(utmp, ut_id, [#include <utmp.h>])
AC_HAVE_STRUCT_FIELD(utmp, ut_pid, [#include <utmp.h>])
AC_HAVE_STRUCT_FIELD(utmp, ut_type, [#include <utmp.h>])
AC_HAVE_STRUCT_FIELD(utmp, ut_user, [#include <utmp.h>])
AC_HAVE_STRUCT_FIELD(utmpx, ut_exit, [#include <utmpx.h>])
AC_HAVE_STRUCT_FIELD(utmpx, ut_syslen, [#include <utmpx.h>])
AC_KRB_IPV6
@ -628,7 +614,8 @@ dnl
dnl Check for sa_len in struct sockaddr
dnl
AC_KRB_STRUCT_SOCKADDR_SA_LEN
AC_HAVE_STRUCT_FIELD(struct sockaddr, sa_len, [#include <sys/types.h>
#include <sys/socket.h>])
AC_GROK_TYPES(int8_t int16_t int32_t int64_t)
@ -647,7 +634,7 @@ if test "$ac_cv_func_el_init" = yes ; then
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)
AC_DEFINE(HAVE_FOUR_VALUED_EL_INIT, 1, [Define if el_init takes four arguments.])
fi
fi
AC_FIND_FUNC_NO_LIBS(readline, edit readline)