Revert "[i965] make stipple pattern continue across GL_LINE_LOOP and GL_LINE_STRIP"

[mesa.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 19f9fcfcb009cd33ad3d673f765b8f459a733f5d..b9ad819fe437df1127d0efcecc3d88f1e0ab2ac5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,16 @@ AC_PATH_PROG(MAKE, make)
 AC_PATH_PROG(MKDEP, makedepend)
 AC_PATH_PROG(SED, sed)
 
+MKDEP_OPTIONS=-fdepend
+dnl Ask gcc where it's keeping its secret headers
+if test "x$GCC" = xyes; then
+    GCC_INCLUDES=`$CC -print-file-name=include`
+    if test "x$GCC_INCLUDES" != x; then
+        MKDEP_OPTIONS="$MKDEP_OPTIONS -I$GCC_INCLUDES"
+    fi
+fi
+AC_SUBST(MKDEP_OPTIONS)
+
 dnl Make sure the pkg-config macros are defined
 m4_ifdef([PKG_PROG_PKG_CONFIG],,[
     AC_MSG_ERROR([The pkg-config autoconf macros are not defined.
@@ -281,7 +291,13 @@ fi
 dnl If $with_demos is yes, directories will be added as libs available
 PROGRAM_DIRS=""
 case "$with_demos" in
-no|yes) ;;
+no) ;;
+yes)
+    # If the driver isn't osmesa, we have libGL and can build xdemos
+    if test "$mesa_driver" != osmesa; then
+        PROGRAM_DIRS="xdemos"
+    fi
+    ;;
 *)
     # verify the requested demos directories exist
     demos=`IFS=,; echo $with_demos`
@@ -459,12 +475,6 @@ if test "$mesa_driver" = dri; then
         PROGRAM_DIRS="egl"
     fi
 
-    # default drivers
-    if test "x$DRI_DIRS" = x; then
-        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
-            savage sis tdfx trident unichrome ffb"
-    fi
-
     # Platform specific settings and drivers to build
     case "$host_os" in
     linux*)
@@ -513,6 +523,13 @@ if test "$mesa_driver" = dri; then
         fi
         ;;
     esac
+
+    # default drivers
+    if test "x$DRI_DIRS" = x; then
+        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
+            savage sis tdfx trident unichrome ffb"
+    fi
+
     DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/  */ /g'`
 
     # Check for expat
@@ -633,11 +650,6 @@ if test "x$enable_glu" = xyes; then
         fi
         ;;
     *)
-        # If GLU is available, we can build the xdemos
-        if test "$with_demos" = yes; then
-            PROGRAM_DIRS="$PROGRAM_DIRS xdemos"
-        fi
-
         # If static, empty GLU_LIB_DEPS and add libs for programs to link
         if test "$enable_static" = no; then
             GLU_LIB_DEPS="-lm"
@@ -794,7 +806,7 @@ linux*)
     ;;
 freebsd*)
     PIC_FLAGS="-fPIC"
-    case "$host_os" in
+    case "$host_cpu" in
     i*86)
         PIC_FLAGS=""
         if test "x$enable_asm" = xyes; then