diff --git a/cf/broken-snprintf.m4 b/cf/broken-snprintf.m4
new file mode 100644
index 000000000..1c6a83d27
--- /dev/null
+++ b/cf/broken-snprintf.m4
@@ -0,0 +1,58 @@
+dnl $Id$
+dnl
+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
+])
diff --git a/cf/broken.m4 b/cf/broken.m4
new file mode 100644
index 000000000..71257ebf7
--- /dev/null
+++ b/cf/broken.m4
@@ -0,0 +1,19 @@
+dnl $Id$
+dnl
+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, [
+ac_tr_func=HAVE_[]upcase($ac_func)
+AC_DEFINE_UNQUOTED($ac_tr_func)],[LIBOBJS="$LIBOBJS ${ac_func}.o"])
+# autoheader tricks *sigh*
+: << END
+@@@funcs="$funcs $1"@@@
+END
+done
+AC_SUBST(LIBOBJS)dnl
+])
diff --git a/cf/check-declaration.m4 b/cf/check-declaration.m4
new file mode 100644
index 000000000..8b972c8d2
--- /dev/null
+++ b/cf/check-declaration.m4
@@ -0,0 +1,30 @@
+dnl $Id$
+dnl
+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
+])
diff --git a/cf/check-var.m4 b/cf/check-var.m4
new file mode 100644
index 000000000..1cae8a3eb
--- /dev/null
+++ b/cf/check-var.m4
@@ -0,0 +1,25 @@
+dnl $Id$
+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
+])
diff --git a/cf/find-func-no-libs.m4 b/cf/find-func-no-libs.m4
new file mode 100644
index 000000000..9147b36ed
--- /dev/null
+++ b/cf/find-func-no-libs.m4
@@ -0,0 +1,61 @@
+dnl $Id$
+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
+
+# $1
+eval "ac_tr_func=HAVE_[]upcase($1)"
+eval "ac_tr_lib=HAVE_LIB[]upcase($ac_res | sed -e 's/-l//')"
+eval "LIB_$1=$ac_res"
+
+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)
+])
diff --git a/cf/find-func.m4 b/cf/find-func.m4
new file mode 100644
index 000000000..c89b8d39e
--- /dev/null
+++ b/cf/find-func.m4
@@ -0,0 +1,9 @@
+dnl $Id$
+dnl
+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
+])
diff --git a/cf/find-if-not-broken.m4 b/cf/find-if-not-broken.m4
new file mode 100644
index 000000000..1cd66a3d3
--- /dev/null
+++ b/cf/find-if-not-broken.m4
@@ -0,0 +1,13 @@
+dnl $Id$
+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
+])
diff --git a/cf/grok-type.m4 b/cf/grok-type.m4
new file mode 100644
index 000000000..ecbbbbaa3
--- /dev/null
+++ b/cf/grok-type.m4
@@ -0,0 +1,32 @@
+dnl $Id$
+dnl
+AC_DEFUN(AC_GROK_TYPE, [
+AC_CACHE_VAL(ac_cv_type_$1, 
+AC_TRY_COMPILE([
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_BITYPES_H
+#include <sys/bitypes.h>
+#endif
+#ifdef HAVE_NETINET_IN6_MACHTYPES_H
+#include <netinet/in6_machtypes.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_[]upcase($i)
+		AC_DEFINE_UNQUOTED($type)
+	fi
+	AC_MSG_RESULT($ac_res)
+done
+])
diff --git a/cf/have-declaration.m4 b/cf/have-declaration.m4
new file mode 100644
index 000000000..8e0caffc8
--- /dev/null
+++ b/cf/have-declaration.m4
@@ -0,0 +1,31 @@
+dnl $Id$
+dnl
+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
+])
+
diff --git a/cf/have-pragma-weak.m4 b/cf/have-pragma-weak.m4
new file mode 100644
index 000000000..96742e4cd
--- /dev/null
+++ b/cf/have-pragma-weak.m4
@@ -0,0 +1,37 @@
+dnl $Id$
+dnl
+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 -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest_foo.$ac_ext conftest_bar.$ac_ext 1>&AC_FD_CC'); 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
+])
diff --git a/cf/have-struct-field.m4 b/cf/have-struct-field.m4
new file mode 100644
index 000000000..cb9482274
--- /dev/null
+++ b/cf/have-struct-field.m4
@@ -0,0 +1,30 @@
+dnl $Id$
+dnl
+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
+])
diff --git a/cf/krb-func-getcwd-broken.m4 b/cf/krb-func-getcwd-broken.m4
new file mode 100644
index 000000000..51b709cfb
--- /dev/null
+++ b/cf/krb-func-getcwd-broken.m4
@@ -0,0 +1,42 @@
+dnl $Id$
+dnl
+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
+])
diff --git a/cf/krb-ipv6.m4 b/cf/krb-ipv6.m4
new file mode 100644
index 000000000..20284a4e0
--- /dev/null
+++ b/cf/krb-ipv6.m4
@@ -0,0 +1,11 @@
+dnl $Id$
+dnl
+AC_DEFUN(AC_KRB_IPV6, [
+AC_MSG_CHECKING(for IPv6)
+foo=no
+AC_EGREP_HEADER(sockaddr_in6, netinet/in.h,
+AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6) foo=yes)
+AC_EGREP_HEADER(sockaddr_in6, netinet/in6.h,
+AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6) foo=yes)
+AC_MSG_RESULT($foo)
+])
diff --git a/cf/krb-prog-ln-s.m4 b/cf/krb-prog-ln-s.m4
new file mode 100644
index 000000000..3802f6c0d
--- /dev/null
+++ b/cf/krb-prog-ln-s.m4
@@ -0,0 +1,28 @@
+dnl $Id$
+dnl
+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
+])
+
diff --git a/cf/krb-prog-ranlib.m4 b/cf/krb-prog-ranlib.m4
new file mode 100644
index 000000000..a96205e73
--- /dev/null
+++ b/cf/krb-prog-ranlib.m4
@@ -0,0 +1,8 @@
+dnl $Id$
+dnl
+dnl
+dnl Also look for EMXOMF for OS/2
+dnl
+
+AC_DEFUN(AC_KRB_PROG_RANLIB,
+[AC_CHECK_PROGS(RANLIB, ranlib EMXOMF, :)])
diff --git a/cf/krb-prog-yacc.m4 b/cf/krb-prog-yacc.m4
new file mode 100644
index 000000000..6abe48e3c
--- /dev/null
+++ b/cf/krb-prog-yacc.m4
@@ -0,0 +1,8 @@
+dnl $Id$
+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')])
diff --git a/cf/krb-struct-sockaddr-sa-len.m4 b/cf/krb-struct-sockaddr-sa-len.m4
new file mode 100644
index 000000000..c056b47e5
--- /dev/null
+++ b/cf/krb-struct-sockaddr-sa-len.m4
@@ -0,0 +1,22 @@
+dnl $Id$
+dnl
+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)
+])
diff --git a/cf/krb-struct-winsize.m4 b/cf/krb-struct-winsize.m4
new file mode 100644
index 000000000..c0520a4af
--- /dev/null
+++ b/cf/krb-struct-winsize.m4
@@ -0,0 +1,25 @@
+dnl $Id$
+dnl
+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))
+])
diff --git a/cf/krb-sys-aix.m4 b/cf/krb-sys-aix.m4
new file mode 100644
index 000000000..6df296dfc
--- /dev/null
+++ b/cf/krb-sys-aix.m4
@@ -0,0 +1,15 @@
+dnl $Id$
+dnl
+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)
+])
diff --git a/cf/krb-sys-nextstep.m4 b/cf/krb-sys-nextstep.m4
new file mode 100644
index 000000000..f82c0d534
--- /dev/null
+++ b/cf/krb-sys-nextstep.m4
@@ -0,0 +1,21 @@
+dnl $Id$
+dnl
+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)
+])
diff --git a/cf/krb-version.m4 b/cf/krb-version.m4
new file mode 100644
index 000000000..8581dbb69
--- /dev/null
+++ b/cf/krb-version.m4
@@ -0,0 +1,25 @@
+dnl $Id$
+dnl
+dnl
+dnl output a C header-file with some version strings
+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";
+FOOBAR
+
+if test -f include/version.h && cmp -s include/newversion.h.in include/version.h.in; then
+	echo "include/version.h is unchanged"
+	rm -f include/newversion.h.in
+else
+ 	echo "creating include/version.h"
+ 	User=${USER-${LOGNAME}}
+ 	Host=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 	Date=`date`
+	mv -f include/newversion.h.in include/version.h.in
+	sed -e "s/@USER@/$User/" -e "s/@HOST@/$Host/" -e "s/@DATE@/$Date/" include/version.h.in > include/version.h
+fi
+dnl ],host=$host PACKAGE=$PACKAGE VERSION=$VERSION)
+])
diff --git a/cf/make-aclocal b/cf/make-aclocal
new file mode 100644
index 000000000..924a52a21
--- /dev/null
+++ b/cf/make-aclocal
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+if [ "$#" -ne 2 ]; then
+	echo "Usage: `basename $0` proto-file output"
+	exit 1
+fi
+
+if rm -f "$2" ; then :; else
+	echo "Failed to remove $2"
+	exit 1
+fi
+
+d=`dirname $0`
+
+for i in `cat "$1"`; do
+	if [ -f "$i" ]; then
+		cat "$i" >> "$2"
+	elif [ -f "$d/$i" ]; then
+		cat "$d/$i" >> "$2"
+	else
+		echo "$i: File not found"
+		exit 1
+	fi
+done
diff --git a/cf/misc.m4 b/cf/misc.m4
new file mode 100644
index 000000000..1ef13ba71
--- /dev/null
+++ b/cf/misc.m4
@@ -0,0 +1,3 @@
+dnl $Id$
+dnl
+define(upcase,`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`)dnl
diff --git a/cf/need-declaration.m4 b/cf/need-declaration.m4
new file mode 100644
index 000000000..23dfbdc91
--- /dev/null
+++ b/cf/need-declaration.m4
@@ -0,0 +1,30 @@
+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_`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
+])
diff --git a/cf/need-proto.m4 b/cf/need-proto.m4
new file mode 100644
index 000000000..c4c1022c7
--- /dev/null
+++ b/cf/need-proto.m4
@@ -0,0 +1,26 @@
+dnl $Id$
+dnl
+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])
+])
diff --git a/cf/proto-compat.m4 b/cf/proto-compat.m4
new file mode 100644
index 000000000..d1e025dec
--- /dev/null
+++ b/cf/proto-compat.m4
@@ -0,0 +1,24 @@
+dnl $Id$
+dnl
+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])
+])
diff --git a/cf/test-package.m4 b/cf/test-package.m4
new file mode 100644
index 000000000..99a55400e
--- /dev/null
+++ b/cf/test-package.m4
@@ -0,0 +1,105 @@
+dnl $Id$
+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])
+])
+
diff --git a/cf/type-mode-t.m4 b/cf/type-mode-t.m4
new file mode 100644
index 000000000..096812c60
--- /dev/null
+++ b/cf/type-mode-t.m4
@@ -0,0 +1,17 @@
+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)
+])
diff --git a/cf/type-sig-atomic-t.m4 b/cf/type-sig-atomic-t.m4
new file mode 100644
index 000000000..30d22e7a4
--- /dev/null
+++ b/cf/type-sig-atomic-t.m4
@@ -0,0 +1,17 @@
+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)
+])