diff -r 275d2fdeab48 -r 22b1de4c74e4 configure.ac
--- a/configure.ac	Mon Feb 02 13:37:00 2009 +0000
+++ b/configure.ac	Wed Feb 04 17:06:14 2009 +0000
@@ -241,6 +241,61 @@
 AC_SUBST(KERNEL_E1000,[$kernele1000])
 
 #------------------------------------------------------------------------------
+# r8169 driver
+#------------------------------------------------------------------------------
+
+AC_ARG_ENABLE([r8169],
+    AS_HELP_STRING([--enable-r8169],
+                   [Enable r8169 driver]),
+    [
+        case "${enableval}" in
+            yes) enable_r8169=1
+                ;;
+            no) enable_r8169=0
+                ;;
+            *) AC_MSG_ERROR([Invalid value for --enable-r8169])
+                ;;
+        esac
+    ],
+    [enable_r8169=0] # disabled by default
+)
+
+AM_CONDITIONAL(ENABLE_R8169, test "x$enable_r8169" = "x1")
+AC_SUBST(ENABLE_R8169,[$enable_r8169])
+
+AC_ARG_WITH([r8169-kernel],
+    AC_HELP_STRING(
+        [--with-r8169-kernel=<X.Y.Z>],
+        [r8169 kernel (only if differing)]
+    ),
+    [
+        kernel_r8169=[$withval]
+    ],
+    [
+        kernel_r8169=$linuxversion
+    ]
+)
+
+if test "x${enable_r8169}" = "x1"; then
+    AC_MSG_CHECKING([for kernel for r8169 driver])
+
+    kernels=`ls -1 ${srcdir}/devices/ | grep -oE "^r8169-.*-" | cut -d "-" -f 2 | uniq`
+    found=0
+    for k in $kernels; do
+        if test "$kernel_r8169" = "$k"; then
+            found=1
+        fi
+    done
+    if test $found -ne 1; then
+        AC_MSG_ERROR([kernel $kernel_r8169 not available for r8169 driver!])
+    fi
+
+    AC_MSG_RESULT([$kernel_r8169])
+fi
+
+AC_SUBST(KERNEL_R8169,[$kernel_r8169])
+
+#------------------------------------------------------------------------------
 # RTAI path (optional)
 #------------------------------------------------------------------------------