diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 3dfd4b973..000000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,743 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-dnl
-dnl General tests
-dnl
-
-dnl
-dnl Look for function in any of the specified libraries
-dnl
-
-dnl AC_FIND_FUNC_NO_LIBS(func, libraries, includes, arguments)
-AC_DEFUN(AC_FIND_FUNC_NO_LIBS, [
-
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(ac_cv_funclib_$1,
-[
-if eval "test \"\$ac_cv_func_$1\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" $2; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-			LIBS="$ac_lib $ac_save_LIBS"
-		fi
-		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}"
-	LIBS="$ac_save_LIBS"
-fi
-])
-
-eval "ac_res=\$ac_cv_funclib_$1"
-
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs $1"@@@
-@@@libs="$libs $2"@@@
-END
-
-changequote(, )dnl
-eval "ac_tr_func=HAVE_`echo $1 | tr '[a-z]' '[A-Z]'`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr '[a-z]' '[A-Z]'`"
-eval "LIB_$1=$ac_res"
-changequote([, ])dnl
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_$1=yes"
-	eval "LIB_$1="
-	AC_DEFINE_UNQUOTED($ac_tr_func)
-	AC_MSG_RESULT([yes])
-	;;
-	no)
-	eval "ac_cv_func_$1=no"
-	eval "LIB_$1="
-	AC_MSG_RESULT([no])
-	;;
-	*)
-	eval "ac_cv_func_$1=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	AC_DEFINE_UNQUOTED($ac_tr_func)
-	AC_DEFINE_UNQUOTED($ac_tr_lib)
-	AC_MSG_RESULT([yes, in $ac_res])
-	;;
-esac
-AC_SUBST(LIB_$1)
-])
-
-dnl AC_FIND_FUNC(func, libraries, includes, arguments)
-AC_DEFUN(AC_FIND_FUNC, [
-AC_FIND_FUNC_NO_LIBS([$1], [$2], [$3], [$4])
-if test -n "$LIB_$1"; then
-	LIBS="$LIB_$1 $LIBS"
-fi
-])
-
-dnl
-dnl Warning!
-dnl
-
-dnl undefine(AC_REPLACE_FUNCS)
-dnl define(AC_BROKEN,AC_REPLACE_FUNCS)
-
-dnl
-dnl Same as AC _REPLACE_FUNCS, just define HAVE_func if found in normal
-dnl libraries 
-
-AC_DEFUN(AC_BROKEN,
-[for ac_func in $1
-do
-AC_CHECK_FUNC($ac_func, [
-changequote(, )dnl
-ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
-changequote([, ])dnl
-AC_DEFINE_UNQUOTED($ac_tr_func)],[LIBOBJS[]="$LIBOBJS ${ac_func}.o"])
-# autoheader tricks *sigh*
-: << END
-@@@funcs="$funcs $1"@@@
-END
-done
-AC_SUBST(LIBOBJS)dnl
-])
-
-dnl
-dnl Mix between AC_FIND_FUNC and AC_BROKEN
-dnl
-
-AC_DEFUN(AC_FIND_IF_NOT_BROKEN,
-[AC_FIND_FUNC([$1], [$2], [$3], [$4])
-if eval "test \"$ac_cv_func_$1\" != yes"; then
-LIBOBJS[]="$LIBOBJS $1.o"
-fi
-AC_SUBST(LIBOBJS)dnl
-])
-
-dnl
-dnl
-dnl
-
-dnl AC_TEST_PACKAGE(package,header,lib,linkline)
-AC_DEFUN(AC_TEST_PACKAGE,
-[
-AC_MSG_CHECKING(for $1)
-AC_ARG_WITH($1,
-[  --with-$1=dir                use $1 in dir],
-[if test "$with_$1" = "no"; then
-  with_$1=
-fi]
-)
-AC_ARG_WITH($1-lib,
-[  --with-$1-lib=dir            use $1-lib in dir],
-[if test "$withval" = "yes" -o "$withval" = "no"; then
-  AC_MSG_ERROR([No argument for --with-$1-lib])
-elif test "X$with_$1" = "X"; then
-  with_$1=yes
-fi]
-)
-AC_ARG_WITH($1-include,
-[  --with-$1-include=dir        use $1-include in dir],
-[if test "$withval" = "yes" -o "$withval" = "no"; then
-  AC_MSG_ERROR([No argument for --with-$1-include])
-elif test "X$with_$1" = "X"; then
-  with_$1=yes
-fi]
-)
-
-define([foo], translit($1, [a-z], [A-Z]))
-: << END
-@@@syms="$syms foo"@@@
-END
-
-if test -n "$with_$1"; then
-  AC_DEFINE([foo])
-  if test "$with_$1" != "yes"; then
-    $1_dir=$with_$1
-  fi
-dnl Try to find include
-  if test -n "$with_$1_include"; then
-    trydir=$with_$1_include
-  elif test "$with_$1" != "yes"; then
-    trydir="$with_$1 $with_$1/include"
-  else
-    trydir=
-  fi
-  found=
-  for i in $trydir ""; do
-    if test -n "$i"; then
-      if test -f $i/$2; then
-        found=yes; res=$i; break
-      fi
-    else
-      AC_TRY_CPP([#include <$2>], [found=yes; res=$i; break])
-    fi
-  done
-  if test -n "$found"; then
-    $1_include=$res
-  else
-    AC_MSG_ERROR(Cannot find $2)
-  fi
-dnl Try to find lib
-  if test -n "$with_$1_lib"; then
-    trydir=$with_$1_lib
-  elif test "$with_$1" != "yes"; then
-    trydir="$with_$1 $with_$1/lib"
-  else
-    trydir=
-  fi
-  found=
-  for i in $trydir ""; do
-    if test -n "$i"; then
-      if test -f $i/$3; then
-        found=yes; res=$i; break
-      fi
-    else
-      old_LIBS=$LIBS
-      LIBS="$4 $LIBS"
-      AC_TRY_LINK([], [], [found=yes; res=$i; LIBS=$old_LIBS; break])
-      LIBS=$old_LIBS
-    fi
-  done
-  if test -n "$found"; then
-    $1_lib=$res
-  else
-    AC_MSG_ERROR(Cannot find $3)
-  fi
-  AC_MSG_RESULT([headers $$1_include, libraries $$1_lib])
-  AC_DEFINE_UNQUOTED(foo)
-  if test -n "$$1_include"; then
-    foo[INCLUDE]="-I$$1_include"
-  fi
-  AC_SUBST(foo[INCLUDE])
-  if test -n "$$1_lib"; then
-    foo[LIB]="-L$$1_lib"
-  fi
-  foo[LIB]="$foo[LIB] $4"
-  AC_SUBST(foo[LIB])
-else
-  AC_MSG_RESULT(no)
-fi
-undefine([foo])
-])
-
-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_`echo $3 | tr '[a-z]' '[A-Z]'`_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
-])
-
-dnl
-dnl
-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; }],
-	    [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_CHECK_DECLARATION([$1],[$2])
-fi
-])
-
-dnl
-dnl Check if we need the prototype for a function
-dnl
-
-dnl AC_NEED_PROTO(includes, function)
-
-AC_DEFUN(AC_NEED_PROTO, [
-AC_CACHE_CHECK([if $2 needs a prototype], ac_cv_func_$2_noproto,
-AC_TRY_COMPILE([$1],
-[struct foo { int foo; } xx;
-extern int $2 (struct foo*);
-$2(&xx);
-],
-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)
-fi
-: << END
-@@@syms="$syms foo"@@@
-END
-undefine([foo])
-])
-
-dnl
-dnl Check if the prototype of a function is compatible with another one
-dnl
-
-dnl AC_PROTO_COMPAT(includes, function, prototype)
-
-AC_DEFUN(AC_PROTO_COMPAT, [
-AC_CACHE_CHECK([if $2 is compatible with system prototype],
-ac_cv_func_$2_proto_compat,
-AC_TRY_COMPILE([$1],
-[$3;],
-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)
-fi
-: << END
-@@@syms="$syms foo"@@@
-END
-undefine([foo])
-])
-
-dnl
-dnl Check if a particular struct has a particular field
-dnl
-
-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_`echo $2 | tr '[a-z]' '[A-Z]'`_`echo $4 | tr '[a-z]' '[A-Z]'`"
-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)
-fi
-])
-
-dnl
-dnl Check if we need the declaration of a variable
-dnl
-
-dnl AC_HAVE_DECLARATION(includes, variable)
-AC_DEFUN(AC_CHECK_DECLARATION, [
-AC_MSG_CHECKING([if $2 is properly declared])
-AC_CACHE_VAL(ac_cv_var_$2_declaration, [
-AC_TRY_COMPILE([$1
-extern struct { int foo; } $2;],
-[$2.foo = 1;],
-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])
-
-AC_MSG_RESULT($ac_cv_var_$2_declaration)
-if eval "test \"\$ac_cv_var_$2_declaration\" = yes"; then
-	AC_DEFINE_UNQUOTED($ac_tr_var)
-fi
-])
-
-dnl
-dnl Specific tests
-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')])
-
-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_EGREP_CPP(yes, 
-[#ifdef NeXT
-	yes
-#endif 
-], krb_cv_sys_nextstep=yes, krb_cv_sys_nextstep=no) )
-if test "$krb_cv_sys_nextstep" = "yes"; then
-  CFLAGS="$CFLAGS -posix"
-  LIBS="$LIBS -posix"
-fi
-AC_MSG_RESULT($krb_cv_sys_nextstep)
-])
-
-dnl
-dnl AIX have a very different syscall convention
-dnl
-AC_DEFUN(AC_KRB_SYS_AIX, [
-AC_MSG_CHECKING(for AIX)
-AC_CACHE_VAL(krb_cv_sys_aix,
-AC_EGREP_CPP(yes, 
-[#ifdef _AIX
-	yes
-#endif 
-], krb_cv_sys_aix=yes, krb_cv_sys_aix=no) )
-AC_MSG_RESULT($krb_cv_sys_aix)
-])
-
-dnl
-dnl test for broken getcwd in (SunOS braindamage)
-dnl
-
-AC_DEFUN(AC_KRB_FUNC_GETCWD_BROKEN, [
-if test "$ac_cv_func_getcwd" = yes; then
-AC_MSG_CHECKING(if getcwd is broken)
-AC_CACHE_VAL(ac_cv_func_getcwd_broken, [
-ac_cv_func_getcwd_broken=no
-
-AC_TRY_RUN([
-#include <errno.h>
-char *getcwd(char*, int);
-
-void *popen(char *cmd, char *mode)
-{
-	errno = ENOTTY;
-	return 0;
-}
-
-int main()
-{
-	char *ret;
-	ret = getcwd(0, 1024);
-	if(ret == 0 && errno == ENOTTY)
-		return 0;
-	return 1;
-}
-], ac_cv_func_getcwd_broken=yes,:,:)
-])
-if test "$ac_cv_func_getcwd_broken" = yes; then
-	AC_DEFINE(BROKEN_GETCWD, 1)dnl
-	LIBOBJS="$LIBOBJS getcwd.o"
-	AC_SUBST(LIBOBJS)dnl
-	AC_MSG_RESULT($ac_cv_func_getcwd_broken)
-else
-	AC_MSG_RESULT([seems ok])
-fi
-fi
-])
-
-
-AC_DEFUN(AC_HAVE_PRAGMA_WEAK, [
-if test "${with_shared}" = "yes"; then
-AC_MSG_CHECKING(for pragma weak)
-AC_CACHE_VAL(ac_have_pragma_weak, [
-ac_have_pragma_weak=no
-cat > conftest_foo.$ac_ext <<'EOF'
-[#]line __oline__ "configure"
-#include "confdefs.h"
-#pragma weak foo = _foo
-int _foo = 17;
-EOF
-cat > conftest_bar.$ac_ext <<'EOF'
-[#]line __oline__ "configure"
-#include "confdefs.h"
-extern int foo;
-
-int t() {
-  return foo;
-}
-
-int main() {
-  return t();
-}
-EOF
-if AC_TRY_EVAL('CC $CFLAGS $CPPFLAGS $LDFLAGS conftest_foo.$ac_ext conftest_bar.$ac_ext -o conftest'); then
-ac_have_pragma_weak=yes
-fi
-rm -rf conftest*
-if test "$ac_have_pragma_weak" = "yes"; then
-	AC_DEFINE(HAVE_PRAGMA_WEAK, 1)dnl
-fi
-AC_MSG_RESULT($ac_have_pragma_weak)
-fi
-])
-])
-
-AC_DEFUN(AC_GROK_TYPE, [
-AC_CACHE_VAL(ac_cv_type_$1, 
-AC_TRY_COMPILE([
-#include "confdefs.h"
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-],
-$i x;
-,
-eval ac_cv_type_$1=yes,
-eval ac_cv_type_$1=no))])
-
-
-AC_DEFUN(AC_GROK_TYPES, [
-for i in $1; do
-	AC_MSG_CHECKING(for $i)
-	AC_GROK_TYPE($i)
-	eval ac_res=\$ac_cv_type_$i
-	if test "$ac_res" = yes; then
-		type=HAVE_`echo $i | tr '[a-z]' '[A-Z]'`
-		AC_DEFINE_UNQUOTED($type)
-	fi
-	AC_MSG_RESULT($ac_res)
-done
-])
-
-dnl
-dnl Search for struct winsize
-dnl
-
-AC_DEFUN(AC_KRB_STRUCT_WINSIZE, [
-AC_MSG_CHECKING(for struct winsize)
-AC_CACHE_VAL(ac_cv_struct_winsize, [
-ac_cv_struct_winsize=no
-for i in sys/termios.h sys/ioctl.h; do
-AC_EGREP_HEADER(
-changequote(, )dnl
-struct[ 	]*winsize,dnl
-changequote([,])dnl
-$i, ac_cv_struct_winsize=yes; break)dnl
-done
-])
-if test "$ac_cv_struct_winsize" = "yes"; then
-  AC_DEFINE(HAVE_STRUCT_WINSIZE, 1)dnl
-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))
-])
-
-dnl
-dnl Check for sa_len in sys/socket.h
-dnl
-
-AC_DEFUN(AC_KRB_STRUCT_SOCKADDR_SA_LEN, [
-AC_MSG_CHECKING(for sa_len in struct sockaddr)
-AC_CACHE_VAL(ac_cv_struct_sockaddr_sa_len, [
-AC_TRY_COMPILE(
-[#include <sys/types.h>
-#include <sys/socket.h>],
-[struct sockaddr sa;
-int foo = sa.sa_len;],
-ac_cv_struct_sockaddr_sa_len=yes,
-ac_cv_struct_sockaddr_sa_len=no)
-])
-if test "$ac_cv_struct_sockaddr_sa_len" = yes; then
-	AC_DEFINE(SOCKADDR_HAS_SA_LEN)dnl
-fi
-AC_MSG_RESULT($ac_cv_struct_sockaddr_sa_len)
-])
-
-dnl
-dnl Better test for ln -s, ln or cp
-dnl
-
-AC_DEFUN(AC_KRB_PROG_LN_S,
-[AC_MSG_CHECKING(for ln -s or something else)
-AC_CACHE_VAL(ac_cv_prog_LN_S,
-[rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  touch conftestdata1
-  if ln conftestdata1 conftestdata2; then
-    rm -f conftestdata*
-    ac_cv_prog_LN_S=ln
-  else
-    ac_cv_prog_LN_S=cp
-  fi
-fi])dnl
-LN_S="$ac_cv_prog_LN_S"
-AC_MSG_RESULT($ac_cv_prog_LN_S)
-AC_SUBST(LN_S)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)
-])
-
-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)
-])
-
-AC_DEFUN(AC_BROKEN_SNPRINTF, [
-AC_CACHE_CHECK(for working snprintf,ac_cv_func_snprintf_working,
-ac_cv_func_snprintf_working=yes
-AC_TRY_RUN([
-#include <stdio.h>
-#include <string.h>
-int main()
-{
-changequote(`,')dnl
-	char foo[3];
-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)
-fi
-])
-
-AC_DEFUN(AC_BROKEN_VSNPRINTF,[
-AC_CACHE_CHECK(for working vsnprintf,ac_cv_func_vsnprintf_working,
-ac_cv_func_vsnprintf_working=yes
-AC_TRY_RUN([
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-
-int foo(int num, ...)
-{
-changequote(`,')dnl
-	char bar[3];
-changequote([,])dnl
-	va_list arg;
-	va_start(arg, num);
-	vsnprintf(bar, 2, "%s", arg);
-	va_end(arg);
-	return strcmp(bar, "1");
-}
-
-
-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)
-fi
-])
-
-dnl
-dnl test for IPv6
-dnl
-
-AC_DEFUN(AC_KRB_IPV6, [
-AC_CACHE_CHECK(for IPv6,ac_cv_lib_ipv6,
-AC_TRY_COMPILE([
-#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_NETINET_IN6_H
-#include <netinet/in6.h>
-#endif
-],
-[
-#if defined(IN6ADDR_ANY_INIT)
-struct in6_addr any = IN6ADDR_ANY_INIT;
-#elif defined(IPV6ADDR_ANY_INIT)
-struct in6_addr any = IPV6ADDR_ANY_INIT;
-#else
-#error no any?
-#endif
- struct sockaddr_in6 sin6;
- int s;
-
- s = socket(AF_INET6, SOCK_DGRAM, 0);
-
- sin6.sin6_family = AF_INET6;
- sin6.sin6_port = htons(17);
- sin6.sin6_addr = any;
- bind(s, (struct sockaddr *)&sin6, sizeof(sin6));
-],
-ac_cv_lib_ipv6=yes,
-ac_cv_lib_ipv6=no))
-if test "$ac_cv_lib_ipv6" = yes; then
-  AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6)
-fi
-])
diff --git a/acinclude.m4.in b/acinclude.m4.in
new file mode 100644
index 000000000..4057c77ce
--- /dev/null
+++ b/acinclude.m4.in
@@ -0,0 +1,25 @@
+misc.m4
+find-func-no-libs.m4
+find-func.m4
+broken.m4
+find-if-not-broken.m4
+test-package.m4
+need-declaration.m4
+check-var.m4
+need-proto.m4
+proto-compat.m4
+have-struct-field.m4
+have-declaration.m4
+krb-prog-yacc.m4
+krb-sys-nextstep.m4
+krb-sys-aix.m4
+krb-func-getcwd-broken.m4
+have-pragma-weak.m4
+grok-type.m4
+krb-struct-winsize.m4
+krb-struct-sockaddr-sa-len.m4
+krb-prog-ln-s.m4
+type-sig-atomic-t.m4
+type-mode-t.m4
+broken-snprintf.m4
+krb-ipv6.m4