[libcvd-members] libcvd configure configure.in make/march_flags

[Paul Smith]

CVSROOT:        /sources/libcvd
Module name:    libcvd
Changes by:     Paul Smith <aardvaark>  06/11/28 16:55:30

Modified files:
        .              : configure configure.in 
        make           : march_flags 

Log message:
        Added test and compiler flags for Intel Core2 processors

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/libcvd/make/march_flags?cvsroot=libcvd&r1=1.6&r2=1.7

Patches:
Index: configure
===================================================================
RCS file: /sources/libcvd/libcvd/configure,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- configure   24 Oct 2006 13:02:29 -0000      1.76
+++ configure   28 Nov 2006 16:55:30 -0000      1.77
@@ -3254,6 +3254,7 @@
 /Pentium III/                                          {print "p3";exit}
 /Intel\(R\) Pentium\(R\) 4/                    {print "p4";exit}
 /Intel\(R\) Pentium\(R\) M/                    {print "pM";exit}
+/Intel\(R\) Core\(TM\)2/                       {print "core2";exit}
 /Intel\(R\) Xeon\(TM\)/                                {print "xeon";exit}
 /Intel\(R\) XEON\(TM\)/                                {print "xeon";exit}
 /AMD Athlon\(tm\) 64 Processor/                {print "athlon64";exit}
@@ -5972,7 +5973,7 @@
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Xlib.h.
+  # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5980,7 +5981,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -6007,7 +6008,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Xlib.h"; then
+  if test -r "$ac_dir/X11/Intrinsic.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -6028,11 +6029,11 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
 int
 main ()
 {
-XrmInitialize ()
+XtMalloc (0)
   ;
   return 0;
 }

Index: configure.in
===================================================================
RCS file: /sources/libcvd/libcvd/configure.in,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- configure.in        28 Nov 2006 15:32:55 -0000      1.75
+++ configure.in        28 Nov 2006 16:55:30 -0000      1.76
@@ -127,6 +127,7 @@
 /Pentium III/                                          {print "p3";exit}
 /Intel\(R\) Pentium\(R\) 4/                    {print "p4";exit}
 /Intel\(R\) Pentium\(R\) M/                    {print "pM";exit}
+/Intel\(R\) Core\(TM\)2/                       {print "core2";exit}
 /Intel\(R\) Xeon\(TM\)/                                {print "xeon";exit}
 /Intel\(R\) XEON\(TM\)/                                {print "xeon";exit}
 /AMD Athlon\(tm\) 64 Processor/                {print "athlon64";exit}

Index: make/march_flags
===================================================================
RCS file: /sources/libcvd/libcvd/make/march_flags,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- make/march_flags    9 Mar 2006 15:29:36 -0000       1.6
+++ make/march_flags    28 Nov 2006 16:55:30 -0000      1.7
@@ -3,6 +3,8 @@
 p4_64 nocona i686
 xeon pentium4 i686
 pM pentium-m pentium4 i686
+core2 pentium-m pentium4 i686
+core2_64 nocona i686
 opteron opteron k8 i686 
 opteron_64 opteron k8 i686 
 athlon64_64 k8 i686