X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=configure.ac;h=6aac482e1a8bd962c8aa66feb57539337448c9dc;hb=2f8fc325aca43693aac368ae5781547cc976d387;hp=b0f17f9286ba88ddfae81f0b13f51b3f720027a9;hpb=7d016b76e22c0911f9a5ee024a2849096661ddd7;p=mesa.git

diff --git a/configure.ac b/configure.ac
index b0f17f9286b..6aac482e1a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,6 +356,18 @@ xlib|dri)
     ;;
 esac
 
+dnl XCB - this is only used for GLX right now
+AC_ARG_ENABLE([xcb],
+    [AS_HELP_STRING([--enable-xcb],
+        [use XCB for GLX @<:@default=disabled@:>@])],
+    [enable_xcb="$enableval"],
+    [enable_xcb=no])
+if test "x$enable_xcb" = xyes; then
+    DEFINES="$DEFINES -DUSE_XCB"
+else
+    enable_xcb=no
+fi
+
 # SELinux awareness.
 AC_ARG_ENABLE([selinux],
     [AS_HELP_STRING([--enable-selinux],
@@ -406,13 +418,26 @@ dri)
 
     # find the DRI deps for libGL
     if test "$x11_pkgconfig" = yes; then
-        PKG_CHECK_MODULES([DRIGL], [x11 xext xxf86vm xdamage xfixes])
+        # add xcb modules if necessary
+        dri_modules="x11 xext xxf86vm xdamage xfixes"
+        if test "$enable_xcb" = yes; then
+            dri_modules="$dri_modules x11-xcb xcb-glx"
+        fi
+
+        PKG_CHECK_MODULES([DRIGL], [$dri_modules])
         X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS"
         GL_LIB_DEPS="$DRIGL_LIBS"
     else
         # should check these...
         X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"
         GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes"
+
+        # XCB can only be used from pkg-config
+        if test "$enable_xcb" = yes; then
+            PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx])
+            X11_INCLUDES="$X11_INCLUDES $XCB_CFLAGS"
+            GL_LIB_DEPS="$GL_LIB_DEPS $XCB_LIBS"
+        fi
     fi
 
     # need DRM libs, -lpthread, etc.
@@ -443,9 +468,9 @@ AC_ARG_ENABLE([glx-tls],
 dnl Directory for DRI drivers
 AC_ARG_WITH([dri-driverdir],
     [AS_HELP_STRING([--with-dri-driverdir=DIR],
-        [directory for the DRI drivers @<:@/usr/X11R6/lib/modules/dri@:>@])],
+        [directory for the DRI drivers @<:@${libdir}/dri@:>@])],
     [DRI_DRIVER_INSTALL_DIR="$withval"],
-    [DRI_DRIVER_INSTALL_DIR='/usr/X11R6/lib/modules/dri'])
+    [DRI_DRIVER_INSTALL_DIR='${libdir}/dri'])
 AC_SUBST([DRI_DRIVER_INSTALL_DIR])
 dnl Direct rendering or just indirect rendering
 AC_ARG_ENABLE([driglx-direct],
@@ -879,21 +904,9 @@ AC_SUBST([ASM_FLAGS])
 AC_SUBST([ASM_SOURCES])
 AC_SUBST([ASM_API])
 
-PIC_FLAGS=""
-case "$host_os" in
-linux*)
-    PIC_FLAGS="-fPIC"
-    ;;
-freebsd* | dragonfly*)
-    PIC_FLAGS="-fPIC"
-    case "$host_cpu" in
-    i?86)
-        PIC_FLAGS=""
-        ;;
-    esac
-    ;;
-esac
-AC_SUBST([PIC_FLAGS])
+dnl PIC code macro
+MESA_PIC_FLAGS
+
 
 dnl Restore LDFLAGS and CPPFLAGS
 LDFLAGS="$_SAVE_LDFLAGS"
@@ -901,13 +914,16 @@ CPPFLAGS="$_SAVE_CPPFLAGS"
 
 dnl Substitute the config
 AC_CONFIG_FILES([configs/autoconf])
-AC_OUTPUT
 
 dnl Replace the configs/current symlink
+AC_CONFIG_COMMANDS([configs],[
 if test -f configs/current || test -L configs/current; then
     rm -f configs/current
 fi
 ln -s autoconf configs/current
+])
+
+AC_OUTPUT
 
 dnl
 dnl Output some configuration info for the user