diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/47_pcmcia_isa.patch | 39 | ||||
| -rw-r--r-- | debian/patches/90_autoconf_autogen.patch | 798 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 470 insertions, 371 deletions
diff --git a/debian/changelog b/debian/changelog index 304e22e..8bba5e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ gnumach (1:20060826.dfsg.1-1) UNRELEASED; urgency=low descriptor initialization to do it partially. - debian/patches/01_gcc-4.1.patch: New file. Thanks to Samuel Thibault <samuel.thibault@ens-lyon.org>. + * Enable PCMCIA ISA support. + - debian/patches/47_pcmcia_isa.patch: New file. + Thanks to Stefan Siegl <stesie@brokenpipe.de>. -- Guillem Jover <guillem@debian.org> Sat, 26 Aug 2006 16:52:37 +0300 diff --git a/debian/patches/47_pcmcia_isa.patch b/debian/patches/47_pcmcia_isa.patch new file mode 100644 index 0000000..75e8cbc --- /dev/null +++ b/debian/patches/47_pcmcia_isa.patch @@ -0,0 +1,39 @@ + +2006-08-28 Stefan Siegl <stesie@brokenpipe.de> + + * i386/linux/configure.ac: Add configuration option allowing to enable + ISA-bus support in the pcmcia core. + + * i386/linux/configure: Regenerate. + * i386/linux/device-drivers.h.in: Likewise. + + +Index: i386/linux/configure.ac +=================================================================== +--- i386/linux/configure.ac.orig 2006-08-29 02:44:29.000000000 +0300 ++++ i386/linux/configure.ac 2006-08-29 02:46:43.000000000 +0300 +@@ -239,6 +239,24 @@ dnl PCMCIA device support. + + linux_DRIVER([i82365], [I82365], [i82365], [pcmcia]) + ++AC_DEFUN([AC_PCMCIA_OPTION], [ ++ AC_ARG_ENABLE([pcmcia-$1], ++ AS_HELP_STRING([--enable-pcmcia-$1], [$4]), [ ++ if test "x$enableval" != "xno"; then ++ AC_DEFINE([CONFIG_$2], [1], [$4]) ++ device_drivers="$device_drivers [$3]" ++ if test "${driver_class_pcmcia_selected+set}" != set; then ++ driver_class_pcmcia_selected=yes ++ AC_DEFINE_UNQUOTED([$driver_class_pcmcia_option], [1]) ++ device_drivers="$device_drivers $driver_class_pcmcia_files" ++ fi ++ fi ++])]) ++ ++AC_PCMCIA_OPTION([isa], [ISA], [], ++ [enable isa-bus-support (pcmcia core)]) ++ ++ + dnl PCMCIA device drivers. + + linux_DRIVER([3c574_cs], [3C574_CS], [3c574_cs], [pcmcia]) diff --git a/debian/patches/90_autoconf_autogen.patch b/debian/patches/90_autoconf_autogen.patch index 8c90744..95f0815 100644 --- a/debian/patches/90_autoconf_autogen.patch +++ b/debian/patches/90_autoconf_autogen.patch @@ -1,11 +1,19 @@ #DPATCHLEVEL=0 ---- configure 2006-03-25 19:36:07.000000000 +0200 -+++ configure 2006-08-26 20:54:24.000000000 +0300 + +This patch is just autogenerated stuff, do not hack directly on it. +Regenerate with: + + autoreconf -fis + find -name autom4te.cache | xargs rm -rf + + +--- configure 2006-08-29 02:44:38.000000000 +0300 ++++ configure 2006-08-29 02:48:31.000000000 +0300 @@ -1,10 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for GNU Mach 1.3. -+# Generated by GNU Autoconf 2.60 for GNU Mach 1.3. ++# Generated by GNU Autoconf 2.60a for GNU Mach 1.3. # # Report bugs to <bug-hurd@gnu.org>. # @@ -1306,7 +1314,7 @@ cat <<\_ACEOF GNU Mach configure 1.3 -generated by GNU Autoconf 2.59 -+generated by GNU Autoconf 2.60 ++generated by GNU Autoconf 2.60a -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1325,7 +1333,7 @@ It was created by GNU Mach $as_me 1.3, which was -generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.60a. Invocation command line was $ $0 $@ @@ -2266,7 +2274,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -@@ -1880,46 +2315,70 @@ ac_clean_files="$ac_clean_files a.out a. +@@ -1880,47 +2315,77 @@ ac_clean_files="$ac_clean_files a.out a. # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. @@ -2320,7 +2328,7 @@ +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. -+for ac_file in $ac_files ++for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in @@ -2357,16 +2365,21 @@ +test "$ac_cv_exeext" = no && ac_cv_exeext= + else ++ ac_file='' ++fi ++ ++{ echo "$as_me:$LINENO: result: $ac_file" >&5 ++echo "${ECHO_T}$ac_file" >&6; } ++if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -1932,19 +2391,23 @@ See \`config.log' for more details." >&2 + +@@ -1932,19 +2397,21 @@ See \`config.log' for more details." >&2 fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 -+{ echo "$as_me:$LINENO: result: $ac_file" >&5 -+echo "${ECHO_T}$ac_file" >&6; } -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either @@ -2390,7 +2403,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -1963,22 +2426,27 @@ See \`config.log' for more details." >&2 +@@ -1963,22 +2430,27 @@ See \`config.log' for more details." >&2 fi fi fi @@ -2430,7 +2443,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then -@@ -1989,9 +2457,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -1989,9 +2461,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -2441,7 +2454,7 @@ break;; * ) break;; esac -@@ -2005,14 +2472,14 @@ See \`config.log' for more details." >&2 +@@ -2005,14 +2476,14 @@ See \`config.log' for more details." >&2 fi rm -f conftest$ac_cv_exeext @@ -2460,7 +2473,7 @@ if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -2032,14 +2499,20 @@ main () +@@ -2032,14 +2503,20 @@ main () } _ACEOF rm -f conftest.o conftest.obj @@ -2485,7 +2498,7 @@ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac -@@ -2057,12 +2530,12 @@ fi +@@ -2057,12 +2534,12 @@ fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -2502,7 +2515,7 @@ if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -2085,23 +2558,36 @@ main () +@@ -2085,23 +2562,36 @@ main () } _ACEOF rm -f conftest.$ac_objext @@ -2546,7 +2559,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -2110,24 +2596,139 @@ else +@@ -2110,24 +2600,139 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2694,7 +2707,7 @@ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -2143,23 +2744,36 @@ main () +@@ -2143,23 +2748,36 @@ main () } _ACEOF rm -f conftest.$ac_objext @@ -2738,15 +2751,12 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -@@ -2168,12 +2782,20 @@ else +@@ -2168,12 +2786,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + @@ -2754,6 +2764,9 @@ +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 @@ -2763,7 +2776,7 @@ if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then -@@ -2189,12 +2811,12 @@ else +@@ -2189,12 +2815,12 @@ else CFLAGS= fi fi @@ -2780,7 +2793,7 @@ ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -2228,12 +2850,17 @@ static char *f (char * (*g) (char **, in +@@ -2228,12 +2854,17 @@ static char *f (char * (*g) (char **, in /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated @@ -2800,7 +2813,7 @@ int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; -@@ -2248,249 +2875,127 @@ return f (e, argv, 0) != argv[0] || f +@@ -2248,227 +2879,100 @@ return f (e, argv, 0) != argv[0] || f return 0; } _ACEOF @@ -2905,53 +2918,8 @@ -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } -+# On Suns, sometimes $CPP names a directory. -+if test -n "$CPP" && test -d "$CPP"; then -+ CPP= -+fi -+if test -z "$CPP"; then -+ if test "${ac_cv_prog_CPP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # Double quotes because CPP needs to be expanded -+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -+ do -+ ac_preproc_ok=false -+for ac_c_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ # <limits.h> exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> - #endif -+ Syntax error - _ACEOF +-#endif +-_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 @@ -3109,26 +3077,40 @@ - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } ++# On Suns, sometimes $CPP names a directory. ++if test -n "$CPP" && test -d "$CPP"; then ++ CPP= ++fi ++if test -z "$CPP"; then ++ if test "${ac_cv_prog_CPP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # Double quotes because CPP needs to be expanded ++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. +@@ -2489,8 +2993,13 @@ cat >>conftest.$ac_ext <<_ACEOF + #endif + Syntax error + _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" @@ -3141,7 +3123,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -2515,9 +3020,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 +@@ -2515,9 +3024,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi @@ -3153,7 +3135,7 @@ # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -2527,8 +3033,13 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -2527,8 +3037,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF @@ -3169,7 +3151,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -2555,6 +3066,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 +@@ -2555,6 +3070,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi @@ -3177,7 +3159,7 @@ rm -f conftest.err conftest.$ac_ext done -@@ -2572,8 +3084,8 @@ fi +@@ -2572,8 +3088,8 @@ fi else ac_cv_prog_CPP=$CPP fi @@ -3188,7 +3170,7 @@ ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do -@@ -2596,8 +3108,13 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -2596,8 +3112,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF @@ -3204,7 +3186,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -2622,9 +3139,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 +@@ -2622,9 +3143,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi @@ -3216,7 +3198,7 @@ # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -2634,8 +3152,13 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -2634,8 +3156,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF @@ -3232,7 +3214,7 @@ ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -2662,6 +3185,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 +@@ -2662,6 +3189,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi @@ -3240,7 +3222,7 @@ rm -f conftest.err conftest.$ac_ext done -@@ -2686,8 +3210,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -2686,8 +3214,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -3251,7 +3233,7 @@ if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -2700,32 +3224,34 @@ do +@@ -2700,32 +3228,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3293,7 +3275,7 @@ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -2738,27 +3264,41 @@ do +@@ -2738,27 +3268,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3342,7 +3324,7 @@ else RANLIB="$ac_cv_prog_RANLIB" fi -@@ -2767,8 +3307,8 @@ fi +@@ -2767,8 +3311,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -3353,7 +3335,7 @@ if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -2781,32 +3321,34 @@ do +@@ -2781,32 +3325,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3395,7 +3377,7 @@ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -2819,26 +3361,41 @@ do +@@ -2819,26 +3365,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3443,7 +3425,7 @@ else AR="$ac_cv_prog_AR" fi -@@ -2846,8 +3403,8 @@ fi +@@ -2846,8 +3407,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 @@ -3454,7 +3436,7 @@ if test "${ac_cv_prog_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -2860,32 +3417,34 @@ do +@@ -2860,32 +3421,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3496,7 +3478,7 @@ if test "${ac_cv_prog_ac_ct_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -2898,26 +3457,41 @@ do +@@ -2898,26 +3461,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3544,7 +3526,7 @@ else LD="$ac_cv_prog_LD" fi -@@ -2925,8 +3499,8 @@ fi +@@ -2925,8 +3503,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. set dummy ${ac_tool_prefix}nm; ac_word=$2 @@ -3555,7 +3537,7 @@ if test "${ac_cv_prog_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -2939,32 +3513,34 @@ do +@@ -2939,32 +3517,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3597,7 +3579,7 @@ if test "${ac_cv_prog_ac_ct_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -2977,26 +3553,41 @@ do +@@ -2977,26 +3557,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3645,7 +3627,7 @@ else NM="$ac_cv_prog_NM" fi -@@ -3004,8 +3595,8 @@ fi +@@ -3004,8 +3599,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -3656,7 +3638,7 @@ if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -3018,32 +3609,34 @@ do +@@ -3018,32 +3613,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3698,7 +3680,7 @@ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -3056,26 +3649,41 @@ do +@@ -3056,26 +3653,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3746,7 +3728,7 @@ else STRIP="$ac_cv_prog_STRIP" fi -@@ -3084,8 +3692,8 @@ fi +@@ -3084,8 +3696,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mig", so it can be a program name with args. set dummy ${ac_tool_prefix}mig; ac_word=$2 @@ -3757,7 +3739,7 @@ if test "${ac_cv_prog_MIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -3098,32 +3706,34 @@ do +@@ -3098,32 +3710,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3799,7 +3781,7 @@ if test "${ac_cv_prog_ac_ct_MIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -3136,27 +3746,41 @@ do +@@ -3136,27 +3750,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3848,7 +3830,7 @@ else MIG="$ac_cv_prog_MIG" fi -@@ -3164,8 +3788,8 @@ fi +@@ -3164,8 +3792,8 @@ fi # Extract the first word of "gzip", so it can be a program name with args. set dummy gzip; ac_word=$2 @@ -3859,7 +3841,7 @@ if test "${ac_cv_prog_GZIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -3178,30 +3802,32 @@ do +@@ -3178,30 +3806,32 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3899,7 +3881,7 @@ if test "${ac_cv_prog_MBCHK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -3214,32 +3840,32 @@ do +@@ -3214,32 +3844,32 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do @@ -3940,7 +3922,7 @@ -@@ -3249,13 +3875,11 @@ subdirs="$subdirs linux" +@@ -3249,13 +3879,11 @@ subdirs="$subdirs linux" # Do machine-specific configuration last so that it can override anything # set above if necessary. if test "$systype" = i386; then @@ -3956,7 +3938,7 @@ cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure -@@ -3275,39 +3899,58 @@ _ACEOF +@@ -3275,39 +3903,58 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. @@ -4031,7 +4013,7 @@ fi fi rm -f confcache -@@ -3316,63 +3959,48 @@ test "x$prefix" = xNONE && prefix=$ac_de +@@ -3316,63 +3963,48 @@ test "x$prefix" = xNONE && prefix=$ac_de # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -4122,7 +4104,7 @@ done LIBOBJS=$ac_libobjs -@@ -3410,11 +4038,35 @@ if test -n "${ZSH_VERSION+set}" && (emul +@@ -3410,11 +4042,35 @@ if test -n "${ZSH_VERSION+set}" && (emul # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' @@ -4160,7 +4142,7 @@ # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset -@@ -3423,8 +4075,43 @@ else +@@ -3423,8 +4079,43 @@ else fi @@ -4205,7 +4187,7 @@ PS1='$ ' PS2='> ' PS4='+ ' -@@ -3438,18 +4125,19 @@ do +@@ -3438,18 +4129,19 @@ do if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else @@ -4228,7 +4210,7 @@ as_basename=basename else as_basename=false -@@ -3457,159 +4145,120 @@ fi +@@ -3457,159 +4149,120 @@ fi # Name of the executable. @@ -4245,6 +4227,14 @@ - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - +- +-# PATH needs CR, and LINENO needs CR and PATH. +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q @@ -4259,16 +4249,6 @@ + } + s/.*/./; q'` --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -+# CDPATH. -+$as_unset CDPATH - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh @@ -4281,12 +4261,14 @@ - fi - rm -f conf$$.sh -fi ++# CDPATH. ++$as_unset CDPATH - as_lineno_1=$LINENO - as_lineno_2=$LINENO +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. @@ -4299,7 +4281,7 @@ - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -- + - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' @@ -4323,10 +4305,10 @@ - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO + as_lineno_1=$LINENO + as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } @@ -4459,7 +4441,7 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: -@@ -3618,7 +4267,19 @@ else +@@ -3618,7 +4271,19 @@ else as_mkdir_p=false fi @@ -4480,7 +4462,7 @@ # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -3627,31 +4288,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P +@@ -3627,31 +4292,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" @@ -4512,11 +4494,11 @@ +ac_log=" This file was extended by GNU Mach $as_me 1.3, which was -generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.60a. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -3659,30 +4303,19 @@ generated by GNU Autoconf 2.59. Invocat +@@ -3659,30 +4307,19 @@ generated by GNU Autoconf 2.59. Invocat CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ @@ -4554,7 +4536,16 @@ ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -@@ -3704,19 +4337,21 @@ Configuration links: +@@ -3690,7 +4327,7 @@ current configuration. + Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit +- -V, --version print version number, then exit ++ -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +@@ -3704,19 +4341,21 @@ Configuration links: $config_links Report bugs to <bug-autoconf@gnu.org>." @@ -4566,7 +4557,7 @@ GNU Mach config.status 1.3 -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.60, ++configured by $0, generated by GNU Autoconf 2.60a, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. @@ -4582,7 +4573,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF -@@ -3727,60 +4362,42 @@ while test $# != 0 +@@ -3727,60 +4366,42 @@ while test $# != 0 do case $1 in --*=*) @@ -4655,7 +4646,7 @@ esac shift -@@ -3796,33 +4413,47 @@ fi +@@ -3796,33 +4417,47 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then @@ -4716,7 +4707,7 @@ # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely -@@ -3833,491 +4464,450 @@ if $ac_need_defaults; then +@@ -3833,491 +4468,450 @@ if $ac_need_defaults; then fi # Have a temporary directory for convenience. Make it in the build tree @@ -5038,7 +5029,7 @@ + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac ++ esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag @@ -5046,9 +5037,7 @@ + shift + ac_file=$1 + shift - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || ++ + case $ac_mode in + :L) ac_source=$1;; + :[FH]) @@ -5087,8 +5076,10 @@ + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; -+ esac -+ + esac + +- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. +- ac_dir=`(dirname "$ac_file") 2>/dev/null || + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ @@ -5576,7 +5567,7 @@ { (exit 0); exit 0; } _ACEOF -@@ -4354,7 +4944,10 @@ if test "$no_recursion" != yes; then +@@ -4354,7 +4948,10 @@ if test "$no_recursion" != yes; then # Remove --cache-file and --srcdir arguments so they do not pile up. ac_sub_configure_args= ac_prev= @@ -5588,7 +5579,7 @@ if test -n "$ac_prev"; then ac_prev= continue -@@ -4377,123 +4970,118 @@ if test "$no_recursion" != yes; then +@@ -4377,123 +4974,118 @@ if test "$no_recursion" != yes; then ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) ;; @@ -5793,7 +5784,7 @@ else { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} -@@ -4505,15 +5093,15 @@ echo "$as_me: WARNING: no configuration +@@ -4505,15 +5097,15 @@ echo "$as_me: WARNING: no configuration # Make the cache file name correct relative to the subdirectory. case $cache_file in [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; @@ -5815,13 +5806,13 @@ { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} { (exit 1); exit 1; }; } ---- i386/configure 2006-02-01 22:58:07.000000000 +0200 -+++ i386/configure 2006-08-26 20:54:23.000000000 +0300 +--- i386/configure 2006-08-29 02:44:38.000000000 +0300 ++++ i386/configure 2006-08-29 02:48:30.000000000 +0300 @@ -1,10 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for GNU Mach 1.3. -+# Generated by GNU Autoconf 2.60 for GNU Mach 1.3. ++# Generated by GNU Autoconf 2.60a for GNU Mach 1.3. # # Report bugs to <bug-hurd@gnu.org>. # @@ -7055,7 +7046,7 @@ cat <<\_ACEOF GNU Mach configure 1.3 -generated by GNU Autoconf 2.59 -+generated by GNU Autoconf 2.60 ++generated by GNU Autoconf 2.60a -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -7074,7 +7065,7 @@ It was created by GNU Mach $as_me 1.3, which was -generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.60a. Invocation command line was $ $0 $@ @@ -7961,7 +7952,7 @@ +ac_log=" This file was extended by GNU Mach $as_me 1.3, which was -generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.60a. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -8002,6 +7993,15 @@ ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. +@@ -1717,7 +2101,7 @@ current configuration. + Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit +- -V, --version print version number, then exit ++ -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions @@ -1728,18 +2112,20 @@ Configuration files: $config_files @@ -8014,7 +8014,7 @@ GNU Mach config.status 1.3 -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.60, ++configured by $0, generated by GNU Autoconf 2.60a, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. @@ -9027,13 +9027,13 @@ { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} { (exit 1); exit 1; }; } ---- i386/linux/configure 2006-08-20 07:29:24.000000000 +0300 -+++ i386/linux/configure 2006-08-26 20:54:20.000000000 +0300 +--- i386/linux/configure 2006-08-29 02:44:38.000000000 +0300 ++++ i386/linux/configure 2006-08-29 02:48:28.000000000 +0300 @@ -1,10 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for GNU Mach 1.3. -+# Generated by GNU Autoconf 2.60 for GNU Mach 1.3. ++# Generated by GNU Autoconf 2.60a for GNU Mach 1.3. # # Report bugs to <bug-hurd@gnu.org>. # @@ -10153,7 +10153,15 @@ --enable-sk_g16 enable driver alias sk_g16 for skg16 --enable-skg16 enable driver skg16 --enable-ni52 enable driver ni52 -@@ -950,120 +1352,86 @@ Optional Features: +@@ -938,6 +1340,7 @@ Optional Features: + --enable-via-rhine enable driver alias via-rhine for viarhine + --enable-viarhine enable driver viarhine + --enable-i82365 enable driver i82365 ++ --enable-pcmcia-isa enable isa-bus-support (pcmcia core) + --enable-3c574_cs enable driver 3c574_cs + --enable-3c589_cs enable driver 3c589_cs + --enable-axnet_cs enable driver axnet_cs +@@ -950,120 +1353,86 @@ Optional Features: Report bugs to <bug-hurd@gnu.org>. _ACEOF @@ -10291,7 +10299,7 @@ cat <<\_ACEOF GNU Mach configure 1.3 -generated by GNU Autoconf 2.59 -+generated by GNU Autoconf 2.60 ++generated by GNU Autoconf 2.60a -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -10310,7 +10318,7 @@ It was created by GNU Mach $as_me 1.3, which was -generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.60a. Invocation command line was $ $0 $@ @@ -10319,7 +10327,7 @@ { cat <<_ASUNAME ## --------- ## -@@ -1082,7 +1450,7 @@ uname -v = `(uname -v) 2>/dev/null || ec +@@ -1082,7 +1451,7 @@ uname -v = `(uname -v) 2>/dev/null || ec /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` @@ -10328,7 +10336,7 @@ /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -@@ -1096,6 +1464,7 @@ do +@@ -1096,6 +1465,7 @@ do test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done @@ -10336,7 +10344,7 @@ } >&5 -@@ -1117,7 +1486,6 @@ _ACEOF +@@ -1117,7 +1487,6 @@ _ACEOF ac_configure_args= ac_configure_args0= ac_configure_args1= @@ -10344,7 +10352,7 @@ ac_must_keep_next=false for ac_pass in 1 2 do -@@ -1128,7 +1496,7 @@ do +@@ -1128,7 +1497,7 @@ do -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; @@ -10353,7 +10361,7 @@ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in -@@ -1150,9 +1518,7 @@ do +@@ -1150,9 +1519,7 @@ do -* ) ac_must_keep_next=true ;; esac fi @@ -10364,7 +10372,7 @@ ;; esac done -@@ -1163,8 +1529,8 @@ $as_unset ac_configure_args1 || test "${ +@@ -1163,8 +1530,8 @@ $as_unset ac_configure_args1 || test "${ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. @@ -10375,7 +10383,7 @@ trap 'exit_status=$? # Save into config.log some information that might help in debugging. { -@@ -1177,20 +1543,34 @@ trap 'exit_status=$? +@@ -1177,20 +1544,34 @@ trap 'exit_status=$? _ASBOX echo # The following way of writing the cache mishandles newlines in values, @@ -10420,7 +10428,7 @@ echo cat <<\_ASBOX -@@ -1201,22 +1581,28 @@ _ASBOX +@@ -1201,22 +1582,28 @@ _ASBOX echo for ac_var in $ac_subst_vars do @@ -10456,7 +10464,7 @@ done | sort echo fi -@@ -1228,26 +1614,24 @@ _ASBOX +@@ -1228,26 +1615,24 @@ _ASBOX ## ----------- ## _ASBOX echo @@ -10488,7 +10496,7 @@ # Predefined preprocessor variables. -@@ -1278,14 +1662,17 @@ _ACEOF +@@ -1278,14 +1663,17 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. @@ -10513,7 +10521,7 @@ if test -r "$ac_site_file"; then { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} -@@ -1301,8 +1688,8 @@ if test -r "$cache_file"; then +@@ -1301,8 +1689,8 @@ if test -r "$cache_file"; then { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in @@ -10524,7 +10532,7 @@ esac fi else -@@ -1314,12 +1701,11 @@ fi +@@ -1314,12 +1702,11 @@ fi # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -10540,7 +10548,7 @@ case $ac_old_set,$ac_new_set in set,) { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -@@ -1344,8 +1730,7 @@ echo "$as_me: current value: $ac_new_v +@@ -1344,8 +1731,7 @@ echo "$as_me: current value: $ac_new_v # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in @@ -10550,7 +10558,7 @@ *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in -@@ -1362,12 +1747,6 @@ echo "$as_me: error: run \`make distclea +@@ -1362,12 +1748,6 @@ echo "$as_me: error: run \`make distclea { (exit 1); exit 1; }; } fi @@ -10563,7 +10571,7 @@ -@@ -1392,6 +1771,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -1392,6 +1772,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -10575,7 +10583,7 @@ -@@ -1413,87 +1797,122 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -1413,87 +1798,122 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -10738,7 +10746,7 @@ -@@ -1573,372 +1992,372 @@ esac +@@ -1573,372 +1993,372 @@ esac # Checking for alias 3c501 @@ -11295,7 +11303,7 @@ -@@ -1980,10 +2399,9 @@ driver_class_wireless_files="" +@@ -1980,10 +2400,9 @@ driver_class_wireless_files="" # Checking for device driver option floppy @@ -11308,7 +11316,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2001,13 +2419,13 @@ _ACEOF +@@ -2001,13 +2420,13 @@ _ACEOF fi fi @@ -11326,7 +11334,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2026,7 +2444,19 @@ _ACEOF +@@ -2026,7 +2445,19 @@ _ACEOF fi fi @@ -11347,7 +11355,7 @@ -@@ -2034,10 +2464,9 @@ fi; +@@ -2034,10 +2465,9 @@ fi; # Checking for device driver option advansys @@ -11360,7 +11368,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2055,23 +2484,23 @@ _ACEOF +@@ -2055,23 +2485,23 @@ _ACEOF fi fi @@ -11392,7 +11400,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2089,23 +2518,23 @@ _ACEOF +@@ -2089,23 +2519,23 @@ _ACEOF fi fi @@ -11424,7 +11432,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2123,16 +2552,16 @@ _ACEOF +@@ -2123,16 +2553,16 @@ _ACEOF fi fi @@ -11445,7 +11453,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2150,16 +2579,16 @@ _ACEOF +@@ -2150,16 +2580,16 @@ _ACEOF fi fi @@ -11466,7 +11474,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2177,16 +2606,16 @@ _ACEOF +@@ -2177,16 +2607,16 @@ _ACEOF fi fi @@ -11487,7 +11495,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2204,16 +2633,16 @@ _ACEOF +@@ -2204,16 +2634,16 @@ _ACEOF fi fi @@ -11508,7 +11516,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2231,16 +2660,16 @@ _ACEOF +@@ -2231,16 +2661,16 @@ _ACEOF fi fi @@ -11529,7 +11537,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2258,23 +2687,23 @@ _ACEOF +@@ -2258,23 +2688,23 @@ _ACEOF fi fi @@ -11561,7 +11569,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2292,16 +2721,16 @@ _ACEOF +@@ -2292,16 +2722,16 @@ _ACEOF fi fi @@ -11582,7 +11590,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2319,23 +2748,23 @@ _ACEOF +@@ -2319,23 +2749,23 @@ _ACEOF fi fi @@ -11614,7 +11622,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2353,23 +2782,23 @@ _ACEOF +@@ -2353,23 +2783,23 @@ _ACEOF fi fi @@ -11646,7 +11654,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2387,16 +2816,16 @@ _ACEOF +@@ -2387,16 +2817,16 @@ _ACEOF fi fi @@ -11667,7 +11675,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2414,16 +2843,16 @@ _ACEOF +@@ -2414,16 +2844,16 @@ _ACEOF fi fi @@ -11688,7 +11696,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2441,16 +2870,16 @@ _ACEOF +@@ -2441,16 +2871,16 @@ _ACEOF fi fi @@ -11709,7 +11717,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2468,23 +2897,23 @@ _ACEOF +@@ -2468,23 +2898,23 @@ _ACEOF fi fi @@ -11741,7 +11749,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2502,23 +2931,23 @@ _ACEOF +@@ -2502,23 +2932,23 @@ _ACEOF fi fi @@ -11773,7 +11781,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2536,23 +2965,23 @@ _ACEOF +@@ -2536,23 +2966,23 @@ _ACEOF fi fi @@ -11805,7 +11813,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2570,16 +2999,16 @@ _ACEOF +@@ -2570,16 +3000,16 @@ _ACEOF fi fi @@ -11826,7 +11834,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2597,16 +3026,16 @@ _ACEOF +@@ -2597,16 +3027,16 @@ _ACEOF fi fi @@ -11847,7 +11855,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2624,23 +3053,23 @@ _ACEOF +@@ -2624,23 +3054,23 @@ _ACEOF fi fi @@ -11879,7 +11887,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2658,23 +3087,23 @@ _ACEOF +@@ -2658,23 +3088,23 @@ _ACEOF fi fi @@ -11911,7 +11919,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2692,16 +3121,16 @@ _ACEOF +@@ -2692,16 +3122,16 @@ _ACEOF fi fi @@ -11932,7 +11940,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2719,23 +3148,23 @@ _ACEOF +@@ -2719,23 +3149,23 @@ _ACEOF fi fi @@ -11964,7 +11972,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2753,16 +3182,16 @@ _ACEOF +@@ -2753,16 +3183,16 @@ _ACEOF fi fi @@ -11985,7 +11993,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2780,16 +3209,16 @@ _ACEOF +@@ -2780,16 +3210,16 @@ _ACEOF fi fi @@ -12006,7 +12014,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2807,16 +3236,16 @@ _ACEOF +@@ -2807,16 +3237,16 @@ _ACEOF fi fi @@ -12027,7 +12035,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2834,16 +3263,16 @@ _ACEOF +@@ -2834,16 +3264,16 @@ _ACEOF fi fi @@ -12048,7 +12056,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2861,19 +3290,20 @@ _ACEOF +@@ -2861,19 +3291,20 @@ _ACEOF fi fi @@ -12074,7 +12082,7 @@ -@@ -2882,10 +3312,9 @@ fi; +@@ -2882,10 +3313,9 @@ fi; # Checking for device driver option starfire @@ -12087,7 +12095,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2903,16 +3332,16 @@ _ACEOF +@@ -2903,16 +3333,16 @@ _ACEOF fi fi @@ -12108,7 +12116,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2930,23 +3359,23 @@ _ACEOF +@@ -2930,23 +3360,23 @@ _ACEOF fi fi @@ -12140,7 +12148,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2964,16 +3393,16 @@ _ACEOF +@@ -2964,16 +3394,16 @@ _ACEOF fi fi @@ -12161,7 +12169,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -2991,23 +3420,23 @@ _ACEOF +@@ -2991,23 +3421,23 @@ _ACEOF fi fi @@ -12193,7 +12201,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3025,16 +3454,16 @@ _ACEOF +@@ -3025,16 +3455,16 @@ _ACEOF fi fi @@ -12214,7 +12222,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3052,16 +3481,16 @@ _ACEOF +@@ -3052,16 +3482,16 @@ _ACEOF fi fi @@ -12235,7 +12243,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3079,16 +3508,16 @@ _ACEOF +@@ -3079,16 +3509,16 @@ _ACEOF fi fi @@ -12256,7 +12264,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3106,15 +3535,15 @@ _ACEOF +@@ -3106,15 +3536,15 @@ _ACEOF fi fi @@ -12276,7 +12284,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3132,13 +3561,13 @@ _ACEOF +@@ -3132,13 +3562,13 @@ _ACEOF fi fi @@ -12294,7 +12302,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3156,22 +3585,22 @@ _ACEOF +@@ -3156,22 +3586,22 @@ _ACEOF fi fi @@ -12325,7 +12333,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3189,14 +3618,14 @@ _ACEOF +@@ -3189,14 +3619,14 @@ _ACEOF fi fi @@ -12344,7 +12352,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3214,22 +3643,22 @@ _ACEOF +@@ -3214,22 +3644,22 @@ _ACEOF fi fi @@ -12375,7 +12383,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3247,14 +3676,14 @@ _ACEOF +@@ -3247,14 +3677,14 @@ _ACEOF fi fi @@ -12394,7 +12402,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3272,13 +3701,13 @@ _ACEOF +@@ -3272,13 +3702,13 @@ _ACEOF fi fi @@ -12412,7 +12420,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3296,13 +3725,13 @@ _ACEOF +@@ -3296,13 +3726,13 @@ _ACEOF fi fi @@ -12430,7 +12438,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3320,13 +3749,13 @@ _ACEOF +@@ -3320,13 +3750,13 @@ _ACEOF fi fi @@ -12448,7 +12456,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3344,22 +3773,22 @@ _ACEOF +@@ -3344,22 +3774,22 @@ _ACEOF fi fi @@ -12479,7 +12487,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3377,16 +3806,16 @@ _ACEOF +@@ -3377,16 +3807,16 @@ _ACEOF fi fi @@ -12500,7 +12508,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3404,16 +3833,16 @@ _ACEOF +@@ -3404,16 +3834,16 @@ _ACEOF fi fi @@ -12521,7 +12529,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3431,14 +3860,14 @@ _ACEOF +@@ -3431,14 +3861,14 @@ _ACEOF fi fi @@ -12540,7 +12548,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3456,13 +3885,13 @@ _ACEOF +@@ -3456,13 +3886,13 @@ _ACEOF fi fi @@ -12558,7 +12566,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3480,15 +3909,15 @@ _ACEOF +@@ -3480,15 +3910,15 @@ _ACEOF fi fi @@ -12578,7 +12586,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3506,16 +3935,16 @@ _ACEOF +@@ -3506,16 +3936,16 @@ _ACEOF fi fi @@ -12599,7 +12607,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3533,16 +3962,16 @@ _ACEOF +@@ -3533,16 +3963,16 @@ _ACEOF fi fi @@ -12620,7 +12628,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3560,16 +3989,16 @@ _ACEOF +@@ -3560,16 +3990,16 @@ _ACEOF fi fi @@ -12641,7 +12649,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3587,23 +4016,23 @@ _ACEOF +@@ -3587,23 +4017,23 @@ _ACEOF fi fi @@ -12673,7 +12681,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3621,23 +4050,23 @@ _ACEOF +@@ -3621,23 +4051,23 @@ _ACEOF fi fi @@ -12705,7 +12713,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3655,16 +4084,16 @@ _ACEOF +@@ -3655,16 +4085,16 @@ _ACEOF fi fi @@ -12726,7 +12734,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3682,16 +4111,16 @@ _ACEOF +@@ -3682,16 +4112,16 @@ _ACEOF fi fi @@ -12747,7 +12755,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3709,16 +4138,16 @@ _ACEOF +@@ -3709,16 +4139,16 @@ _ACEOF fi fi @@ -12768,7 +12776,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3736,16 +4165,16 @@ _ACEOF +@@ -3736,16 +4166,16 @@ _ACEOF fi fi @@ -12789,7 +12797,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3763,16 +4192,16 @@ _ACEOF +@@ -3763,16 +4193,16 @@ _ACEOF fi fi @@ -12810,7 +12818,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3790,23 +4219,23 @@ _ACEOF +@@ -3790,23 +4220,23 @@ _ACEOF fi fi @@ -12842,7 +12850,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3824,23 +4253,23 @@ _ACEOF +@@ -3824,23 +4254,23 @@ _ACEOF fi fi @@ -12874,7 +12882,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3858,16 +4287,16 @@ _ACEOF +@@ -3858,16 +4288,16 @@ _ACEOF fi fi @@ -12895,7 +12903,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3885,16 +4314,16 @@ _ACEOF +@@ -3885,16 +4315,16 @@ _ACEOF fi fi @@ -12916,7 +12924,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3912,23 +4341,50 @@ _ACEOF +@@ -3912,23 +4342,50 @@ _ACEOF fi fi @@ -12975,7 +12983,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3946,16 +4402,16 @@ _ACEOF +@@ -3946,16 +4403,16 @@ _ACEOF fi fi @@ -12996,7 +13004,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -3973,16 +4429,16 @@ _ACEOF +@@ -3973,16 +4430,16 @@ _ACEOF fi fi @@ -13017,7 +13025,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4000,16 +4456,16 @@ _ACEOF +@@ -4000,16 +4457,16 @@ _ACEOF fi fi @@ -13038,7 +13046,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4027,16 +4483,16 @@ _ACEOF +@@ -4027,16 +4484,16 @@ _ACEOF fi fi @@ -13059,7 +13067,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4054,23 +4510,23 @@ _ACEOF +@@ -4054,23 +4511,23 @@ _ACEOF fi fi @@ -13091,7 +13099,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4088,16 +4544,16 @@ _ACEOF +@@ -4088,16 +4545,16 @@ _ACEOF fi fi @@ -13112,7 +13120,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4115,16 +4571,16 @@ _ACEOF +@@ -4115,16 +4572,16 @@ _ACEOF fi fi @@ -13133,7 +13141,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4142,16 +4598,16 @@ _ACEOF +@@ -4142,16 +4599,16 @@ _ACEOF fi fi @@ -13154,7 +13162,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4169,14 +4625,14 @@ _ACEOF +@@ -4169,14 +4626,14 @@ _ACEOF fi fi @@ -13173,7 +13181,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4194,15 +4650,15 @@ _ACEOF +@@ -4194,15 +4651,15 @@ _ACEOF fi fi @@ -13193,7 +13201,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4220,16 +4676,16 @@ _ACEOF +@@ -4220,16 +4677,16 @@ _ACEOF fi fi @@ -13214,7 +13222,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4247,23 +4703,23 @@ _ACEOF +@@ -4247,23 +4704,23 @@ _ACEOF fi fi @@ -13246,7 +13254,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4281,16 +4737,16 @@ _ACEOF +@@ -4281,16 +4738,16 @@ _ACEOF fi fi @@ -13267,7 +13275,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4308,23 +4764,23 @@ _ACEOF +@@ -4308,23 +4765,23 @@ _ACEOF fi fi @@ -13299,7 +13307,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4342,7 +4798,8 @@ _ACEOF +@@ -4342,7 +4799,8 @@ _ACEOF fi fi @@ -13309,7 +13317,7 @@ -@@ -4351,10 +4808,9 @@ fi; +@@ -4351,10 +4809,9 @@ fi; # Checking for device driver option i82365 @@ -13322,17 +13330,44 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4372,7 +4828,8 @@ _ACEOF +@@ -4372,7 +4829,35 @@ _ACEOF fi fi -fi; +fi + ++ ++ ++ ++ ++ ++ # Check whether --enable-pcmcia-isa was given. ++if test "${enable_pcmcia_isa+set}" = set; then ++ enableval=$enable_pcmcia_isa; ++ if test "x$enableval" != "xno"; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define CONFIG_ISA 1 ++_ACEOF ++ ++ device_drivers="$device_drivers " ++ if test "${driver_class_pcmcia_selected+set}" != set; then ++ driver_class_pcmcia_selected=yes ++ cat >>confdefs.h <<_ACEOF ++#define $driver_class_pcmcia_option 1 ++_ACEOF ++ ++ device_drivers="$device_drivers $driver_class_pcmcia_files" ++ fi ++ fi ++ ++fi ++ -@@ -4380,10 +4837,9 @@ fi; +@@ -4380,10 +4865,9 @@ fi; # Checking for device driver option 3c574_cs @@ -13345,7 +13380,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4401,16 +4857,16 @@ _ACEOF +@@ -4401,16 +4885,16 @@ _ACEOF fi fi @@ -13366,7 +13401,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4428,16 +4884,16 @@ _ACEOF +@@ -4428,16 +4912,16 @@ _ACEOF fi fi @@ -13387,7 +13422,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4455,16 +4911,16 @@ _ACEOF +@@ -4455,16 +4939,16 @@ _ACEOF fi fi @@ -13408,7 +13443,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4482,16 +4938,16 @@ _ACEOF +@@ -4482,16 +4966,16 @@ _ACEOF fi fi @@ -13429,7 +13464,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4509,14 +4965,14 @@ _ACEOF +@@ -4509,14 +4993,14 @@ _ACEOF fi fi @@ -13448,7 +13483,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4534,15 +4990,15 @@ _ACEOF +@@ -4534,15 +5018,15 @@ _ACEOF fi fi @@ -13468,7 +13503,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4560,16 +5016,16 @@ _ACEOF +@@ -4560,16 +5044,16 @@ _ACEOF fi fi @@ -13489,7 +13524,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4587,16 +5043,16 @@ _ACEOF +@@ -4587,16 +5071,16 @@ _ACEOF fi fi @@ -13510,7 +13545,7 @@ if test "x$enableval" != xno; then cat >>confdefs.h <<\_ACEOF -@@ -4615,7 +5071,8 @@ _ACEOF +@@ -4615,7 +5099,8 @@ _ACEOF fi fi @@ -13520,7 +13555,7 @@ if test x"${driver_class_wireless_selected+set}" = xset; then -@@ -4641,7 +5098,7 @@ _ACEOF +@@ -4641,7 +5126,7 @@ _ACEOF fi @@ -13529,7 +13564,7 @@ cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure -@@ -4661,39 +5118,58 @@ _ACEOF +@@ -4661,39 +5146,58 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. @@ -13604,7 +13639,7 @@ fi fi rm -f confcache -@@ -4702,32 +5178,18 @@ test "x$prefix" = xNONE && prefix=$ac_de +@@ -4702,32 +5206,18 @@ test "x$prefix" = xNONE && prefix=$ac_de # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -13643,7 +13678,7 @@ done LIBOBJS=$ac_libobjs -@@ -4765,21 +5227,80 @@ if test -n "${ZSH_VERSION+set}" && (emul +@@ -4765,11 +5255,35 @@ if test -n "${ZSH_VERSION+set}" && (emul # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' @@ -13656,13 +13691,7 @@ +BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false --fi - ++ +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -13684,14 +13713,13 @@ + rm -f conf$$.sh +fi + -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ + # Support unset when possible. + if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +@@ -4778,8 +5292,43 @@ else + fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. @@ -13724,7 +13752,7 @@ + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi - ++ # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH @@ -13733,7 +13761,7 @@ PS1='$ ' PS2='> ' PS4='+ ' -@@ -4793,18 +5314,19 @@ do +@@ -4793,18 +5342,19 @@ do if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else @@ -13756,7 +13784,7 @@ as_basename=basename else as_basename=false -@@ -4812,159 +5334,120 @@ fi +@@ -4812,159 +5362,120 @@ fi # Name of the executable. @@ -13786,9 +13814,7 @@ + } + s/.*/./; q'` -+# CDPATH. -+$as_unset CDPATH - +- -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -13809,12 +13835,14 @@ - fi - rm -f conf$$.sh -fi ++# CDPATH. ++$as_unset CDPATH - as_lineno_1=$LINENO - as_lineno_2=$LINENO +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. @@ -13827,7 +13855,7 @@ - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -- + - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' @@ -13851,10 +13879,10 @@ - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO + as_lineno_1=$LINENO + as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } @@ -13987,7 +14015,7 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: -@@ -4973,7 +5456,19 @@ else +@@ -4973,7 +5484,19 @@ else as_mkdir_p=false fi @@ -14008,7 +14036,7 @@ # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -4982,31 +5477,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P +@@ -4982,31 +5505,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" @@ -14040,11 +14068,11 @@ +ac_log=" This file was extended by GNU Mach $as_me 1.3, which was -generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.60a. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -5014,30 +5492,19 @@ generated by GNU Autoconf 2.59. Invocat +@@ -5014,30 +5520,19 @@ generated by GNU Autoconf 2.59. Invocat CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ @@ -14065,13 +14093,13 @@ -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" - +- -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi -- ++config_files="$ac_config_files" ++config_headers="$ac_config_headers" + -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi @@ -14082,7 +14110,16 @@ ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -@@ -5061,18 +5528,20 @@ Configuration headers: +@@ -5045,7 +5540,7 @@ current configuration. + Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit +- -V, --version print version number, then exit ++ -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +@@ -5061,18 +5556,20 @@ Configuration headers: $config_headers Report bugs to <bug-autoconf@gnu.org>." @@ -14094,7 +14131,7 @@ GNU Mach config.status 1.3 -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.60, ++configured by $0, generated by GNU Autoconf 2.60a, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. @@ -14108,7 +14145,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF -@@ -5083,39 +5552,24 @@ while test $# != 0 +@@ -5083,39 +5580,24 @@ while test $# != 0 do case $1 in --*=*) @@ -14154,7 +14191,7 @@ debug=: ;; --file | --fil | --fi | --f ) $ac_shift -@@ -5125,18 +5579,24 @@ Try \`$0 --help' for more information." +@@ -5125,18 +5607,24 @@ Try \`$0 --help' for more information." $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; @@ -14184,7 +14221,7 @@ esac shift -@@ -5152,30 +5612,44 @@ fi +@@ -5152,30 +5640,44 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then @@ -14239,7 +14276,7 @@ # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely -@@ -5186,545 +5660,496 @@ if $ac_need_defaults; then +@@ -5186,545 +5688,496 @@ if $ac_need_defaults; then fi # Have a temporary directory for convenience. Make it in the build tree @@ -14443,13 +14480,13 @@ fi -fi # test -n "$CONFIG_FILES" +done -+ + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi - ++ +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end @@ -14504,7 +14541,7 @@ +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; - esac ++ esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 @@ -14520,9 +14557,7 @@ + shift + ac_file=$1 + shift - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || ++ + case $ac_mode in + :L) ac_source=$1;; + :[FH]) @@ -14561,8 +14596,10 @@ + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; -+ esac -+ + esac + +- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. +- ac_dir=`(dirname "$ac_file") 2>/dev/null || + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ @@ -14701,8 +14738,7 @@ + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - +- -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in @@ -14741,14 +14777,9 @@ - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +- ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - -+_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: @@ -14760,7 +14791,12 @@ - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." -- ++ case $ac_mode in ++ :F) ++ # ++ # CONFIG_FILE ++ # + - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: @@ -14788,7 +14824,8 @@ - fi;; - esac - done` || { (exit 1); exit 1; } -- ++_ACEOF + - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} @@ -14852,10 +14889,6 @@ - cat $tmp/out - rm -f $tmp/out - fi -- --done --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t @@ -14876,6 +14909,10 @@ +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} +-done +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF +- -# -# CONFIG_HEADER section. -# @@ -15189,8 +15226,8 @@ { (exit 0); exit 0; } _ACEOF ---- i386/linux/device-drivers.h.in 2006-08-20 07:29:24.000000000 +0300 -+++ i386/linux/device-drivers.h.in 2006-08-26 20:54:22.000000000 +0300 +--- i386/linux/device-drivers.h.in 2006-08-29 02:44:39.000000000 +0300 ++++ i386/linux/device-drivers.h.in 2006-08-29 02:48:30.000000000 +0300 @@ -6,9 +6,6 @@ /* 3c574_cs */ #undef CONFIG_3C574_CS @@ -15240,7 +15277,17 @@ /* eth16i */ #undef CONFIG_ETH16I -@@ -270,6 +258,9 @@ +@@ -123,6 +111,9 @@ + /* intel_gige */ + #undef CONFIG_INTEL_GIGE + ++/* enable isa-bus-support (pcmcia core) */ ++#undef CONFIG_ISA ++ + /* lance */ + #undef CONFIG_LANCE + +@@ -270,6 +261,9 @@ /* seeq8005 */ #undef CONFIG_SEEQ8005 @@ -15250,7 +15297,7 @@ /* skg16 */ #undef CONFIG_SK_G16 -@@ -285,9 +276,6 @@ +@@ -285,9 +279,6 @@ /* tlan */ #undef CONFIG_TLAN @@ -15261,7 +15308,7 @@ #undef CONFIG_ULTRA --- i386/linux/device-drivers.h.in~ 1970-01-01 02:00:00.000000000 +0200 -+++ i386/linux/device-drivers.h.in~ 2006-08-20 07:29:24.000000000 +0300 ++++ i386/linux/device-drivers.h.in~ 2006-08-29 02:44:39.000000000 +0300 @@ -0,0 +1,340 @@ +/* device-drivers.h.in. Generated from configure.ac by autoheader. */ + @@ -15603,13 +15650,13 @@ + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION ---- linux/configure 2006-02-01 22:58:09.000000000 +0200 -+++ linux/configure 2006-08-26 20:54:12.000000000 +0300 +--- linux/configure 2006-08-29 02:44:38.000000000 +0300 ++++ linux/configure 2006-08-29 02:48:20.000000000 +0300 @@ -1,10 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for GNU Mach 1.3. -+# Generated by GNU Autoconf 2.60 for GNU Mach 1.3. ++# Generated by GNU Autoconf 2.60a for GNU Mach 1.3. # # Report bugs to <bug-hurd@gnu.org>. # @@ -16853,7 +16900,7 @@ cat <<\_ACEOF GNU Mach configure 1.3 -generated by GNU Autoconf 2.59 -+generated by GNU Autoconf 2.60 ++generated by GNU Autoconf 2.60a -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -16872,7 +16919,7 @@ It was created by GNU Mach $as_me 1.3, which was -generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.60a. Invocation command line was $ $0 $@ @@ -17859,7 +17906,7 @@ +ac_log=" This file was extended by GNU Mach $as_me 1.3, which was -generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.60. Invocation command line was ++generated by GNU Autoconf 2.60a. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -17900,6 +17947,15 @@ ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. +@@ -1762,7 +2186,7 @@ current configuration. + Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit +- -V, --version print version number, then exit ++ -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions @@ -1771,18 +2195,20 @@ Configuration links: $config_links @@ -17912,7 +17968,7 @@ GNU Mach config.status 1.3 -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.60, ++configured by $0, generated by GNU Autoconf 2.60a, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. diff --git a/debian/patches/series b/debian/patches/series index 4ea0e1b..9729568 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,5 +14,6 @@ 44_more_ports.patch -p1 45_io_per_task.patch -p0 46_io_device.patch -p1 +47_pcmcia_isa.patch -p0 61_vm_resident-zoned.patch -p0 90_autoconf_autogen.patch -p0 |