merge of '42c7569b1dc10cfed4aef02b04809e2247f3f535'

     and 'e0ffb9b29f40ba86057125fc2c1f717ffd362976'

5 files changed, 5 insertions, 2 deletions

diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf
index 37d2945301..0ef522441b 100644
--- a/conf/machine/i586-generic.conf
+++ b/conf/machine/i586-generic.conf
@@ -25,5 +25,5 @@ MACHINE_TASK_PROVIDER = "task-base"
 
 
 #tune for pentium cpu
-require conf/machine/include/tune-pentium.conf
+require conf/machine/include/tune-pentium.inc
 
diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf
index 3defb29fa5..8ff87553ba 100644
--- a/conf/machine/i686-generic.conf
+++ b/conf/machine/i686-generic.conf
@@ -23,5 +23,5 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_TASK_PROVIDER = "task-base"
 
 #tune for pentium pro cpu
-require conf/machine/include/tune-pentiumpro.conf
+require conf/machine/include/tune-pentiumpro.inc
 
diff --git a/conf/machine/include/tune-pentium.conf b/conf/machine/include/tune-pentium.inc
index 7b1a517895..7b1a517895 100644
--- a/conf/machine/include/tune-pentium.conf
+++ b/conf/machine/include/tune-pentium.inc
diff --git a/conf/machine/include/tune-pentiumpro.conf b/conf/machine/include/tune-pentiumpro.inc
index aa9a8dfa1d..aa9a8dfa1d 100644
--- a/conf/machine/include/tune-pentiumpro.conf
+++ b/conf/machine/include/tune-pentiumpro.inc
diff --git a/site/ix86-common b/site/ix86-common
index 00c544f382..226e2e0f79 100644
--- a/site/ix86-common
+++ b/site/ix86-common
@@ -166,6 +166,9 @@ libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
 ac_cv_lbl_unaligned_fail=${ac_cv_lbl_unaligned_fail=no}
 ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
 
+# libpcap
+ac_cv_linux_vers=${ac_cv_linux_vers=2}
+
 # libxfce4util
 with_broken_putenv=${with_broken_putenv=no}