From 5b6de0557b1f3fed68855b4ca993825781fe1750 Mon Sep 17 00:00:00 2001
From: didg <didg>
Date: Fri, 12 Dec 2003 19:29:55 +0000
Subject: [PATCH] configure change for linux 2.6 from Thomas Kaiser

---
 configure.in      | 26 +++++++++++++++++++++++++-
 sys/netatalk/at.h |  9 ++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 0b086f4f..5a9ed7c9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.179.2.3.2.13 2003-12-03 15:21:36 lenneis Exp $
+dnl $Id: configure.in,v 1.179.2.3.2.14 2003-12-12 19:29:55 didg Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -594,6 +594,29 @@ fi
 dnl ----- Linux specific -----
 if test x"$this_os" = "xlinux"; then 
 	AC_MSG_RESULT([ * Linux specific configuration])
+	
+	dnl ----- kernel 2.6 changed struct at_addr to atalk_addr
+	AC_MSG_CHECKING([for struct atalk_addr])
+	AC_COMPILE_IFELSE([
+#include <sys/socket.h>
+#include <asm/types.h>
+#include <linux/atalk.h>
+
+int main() {
+	struct atalk_addr foo;
+
+	return 0;
+}
+	], [
+		ac_have_atalk_addr=yes
+		AC_MSG_RESULT([yes])
+	], [
+		AC_MSG_RESULT([no])
+	])
+
+if test "x$ac_have_atalk_addr" = "xyes"; then
+	AC_DEFINE(HAVE_ATALK_ADDR, 1, [set if struct at_addr is called atalk_addr])
+fi
 
 	dnl ----- check if we need the quotactl wrapper
 #	AC_CHECK_HEADERS(sys/quota.h linux/quota.h)
@@ -933,3 +956,4 @@ AC_OUTPUT([Makefile
 AM_NETATALK_LIBS_SUMMARY
 AM_NETATALK_CONFIG_SUMMARY
 
+
diff --git a/sys/netatalk/at.h b/sys/netatalk/at.h
index 3a38a7e7..b9214bef 100644
--- a/sys/netatalk/at.h
+++ b/sys/netatalk/at.h
@@ -1,5 +1,5 @@
 /*
- * $Id: at.h,v 1.3 2001-11-25 21:55:10 srittau Exp $
+ * $Id: at.h,v 1.3.10.1 2003-12-12 19:29:55 didg Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  *
@@ -13,6 +13,12 @@
 #include <sys/socket.h>
 #include <asm/types.h>
 #include <linux/atalk.h>
+
+#ifdef HAVE_ATALK_ADDR
+#define at_addr atalk_addr
+#define netrange atalk_netrange
+#endif /* HAVE_ATALK_ADDR */
+
 #else /* linux */
 
 #include <sys/types.h>
@@ -121,3 +127,4 @@ extern struct protosw	atalksw[];
 
 #endif /* linux */
 #endif /* __AT_HEADER__ */
+
-- 
2.39.2