From d67bd60ecf13331ec5aa12bdb88b35f44dccdeb0 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Fri, 20 Feb 2009 11:03:18 +0000 Subject: gallium: s/GALLIUM_DRIVER_DIRS/GALLIUM_DRIVERS_DIRS/ --- configs/autoconf.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configs/autoconf.in') diff --git a/configs/autoconf.in b/configs/autoconf.in index b352974a4c..af66d58a6d 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -64,12 +64,12 @@ GLU_DIRS = @GLU_DIRS@ DRIVER_DIRS = @DRIVER_DIRS@ GALLIUM_DIRS = @GALLIUM_DIRS@ GALLIUM_AUXILIARY_DIRS = @GALLIUM_AUXILIARY_DIRS@ -GALLIUM_DRIVER_DIRS = @GALLIUM_DRIVER_DIRS@ +GALLIUM_DRIVERS_DIRS = @GALLIUM_DRIVERS_DIRS@ GALLIUM_WINSYS_DIRS = @GALLIUM_WINSYS_DIRS@ GALLIUM_WINSYS_DRM_DIRS = @GALLIUM_WINSYS_DRM_DIRS@ GALLIUM_STATE_TRACKERS_DIRS = @GALLIUM_STATE_TRACKERS_DIRS@ GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a) -GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) +GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) # Which subdirs under $(TOP)/progs/ to enter: PROGRAM_DIRS = @PROGRAM_DIRS@ -- cgit v1.2.3 From 53b373451142aeea9111143d7902bf8f5716ef75 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Wed, 25 Feb 2009 17:45:34 -0800 Subject: autoconf: Fixup EGL build This gets the needed libraries pulled in for libEGL for autoconf. --- configs/autoconf.in | 1 + configure.ac | 13 +++++++++++++ 2 files changed, 14 insertions(+) (limited to 'configs/autoconf.in') diff --git a/configs/autoconf.in b/configs/autoconf.in index af66d58a6d..e034431618 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -90,6 +90,7 @@ MOTIF_CFLAGS = @MOTIF_CFLAGS@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) @GL_LIB_DEPS@ OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \ $(EXTRA_LIB_PATH) @OSMESA_LIB_DEPS@ +EGL_LIB_DEPS = $(EXTRA_LIB_PATH) @EGL_LIB_DEPS@ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \ $(EXTRA_LIB_PATH) @GLU_LIB_DEPS@ GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLUT_MESA_DEPS@ \ diff --git a/configure.ac b/configure.ac index bc233a7509..a57e5b3ea7 100644 --- a/configure.ac +++ b/configure.ac @@ -855,6 +855,19 @@ AC_SUBST([OSMESA_MESA_DEPS]) AC_SUBST([OSMESA_PC_REQ]) AC_SUBST([OSMESA_PC_LIB_PRIV]) +dnl +dnl EGL configuration +dnl +if test "$x11_pkgconfig" = yes; then + PKG_CHECK_MODULES([EGL],[x11]) + EGL_LIB_DEPS="$EGL_LIBS" +else + # should check these... + EGL_LIB_DEPS="$X_LIBS -lX11" +fi +EGL_LIB_DEPS="$EGL_LIB_DEPS $DLOPEN_LIBS $OS_LIBS" +AC_SUBST([EGL_LIB_DEPS]) + dnl dnl GLU configuration dnl -- cgit v1.2.3 From 8acca48cd575335b33cdc8fed6906f4d656233cc Mon Sep 17 00:00:00 2001 From: Joel Bosveld Date: Fri, 6 Mar 2009 08:46:08 +0900 Subject: st/xorg: Install to XORG_DRIVER_INSTALL_DIR --- configs/autoconf.in | 3 +++ configs/default | 3 +++ configure.ac | 7 +++++++ src/gallium/winsys/drm/intel/xorg/Makefile | 3 ++- src/gallium/winsys/drm/radeon/xorg/Makefile | 3 ++- 5 files changed, 17 insertions(+), 2 deletions(-) (limited to 'configs/autoconf.in') diff --git a/configs/autoconf.in b/configs/autoconf.in index e034431618..b61d7f33f0 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -123,6 +123,9 @@ DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@ # Where libGL will look for DRI hardware drivers DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) +# Xorg driver install directory (for xorg state-tracker) +XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@ + # pkg-config substitutions GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@ GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@ diff --git a/configs/default b/configs/default index 4eecd9cd52..eab36a3677 100644 --- a/configs/default +++ b/configs/default @@ -122,6 +122,9 @@ DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri # Where libGL will look for DRI hardware drivers DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) +# Xorg driver install directory (for xorg state-tracker) +XORG_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/xorg/modules/drivers + # pkg-config substitutions GL_PC_REQ_PRIV = GL_PC_LIB_PRIV = diff --git a/configure.ac b/configure.ac index 919b717db4..46070fd73c 100644 --- a/configure.ac +++ b/configure.ac @@ -1134,6 +1134,13 @@ yes) ;; esac +AC_ARG_WITH([xorg-driver-dir], + [AS_HELP_STRING([--with-xorg-driver-dir=DIR], + [Default xorg driver directory[[default=${libdir}/xorg/modules/drivers]]])], + [XORG_DRIVER_INSTALL_DIR="$withval"], + [XORG_DRIVER_INSTALL_DIR="${libdir}/xorg/modules/drivers"]) +AC_SUBST([XORG_DRIVER_INSTALL_DIR]) + dnl dnl Gallium Intel configuration dnl diff --git a/src/gallium/winsys/drm/intel/xorg/Makefile b/src/gallium/winsys/drm/intel/xorg/Makefile index 8130fdb226..a45ca570db 100644 --- a/src/gallium/winsys/drm/intel/xorg/Makefile +++ b/src/gallium/winsys/drm/intel/xorg/Makefile @@ -37,6 +37,7 @@ clean: rm -rf $(OBJECTS) $(TARGET) install: - cp $(TARGET) /opt/kms/lib/xorg/modules/drivers + $(INSTALL) -d $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR) + $(INSTALL) -m 755 $(TARGET) $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR) .PHONY = all clean install diff --git a/src/gallium/winsys/drm/radeon/xorg/Makefile b/src/gallium/winsys/drm/radeon/xorg/Makefile index e37261aa63..6ffd4a3a54 100644 --- a/src/gallium/winsys/drm/radeon/xorg/Makefile +++ b/src/gallium/winsys/drm/radeon/xorg/Makefile @@ -36,6 +36,7 @@ clean: rm -rf $(OBJECTS) $(TARGET) install: - cp $(TARGET) /opt/kms/lib/xorg/modules/drivers + $(INSTALL) -d $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR) + $(INSTALL) -m 755 $(TARGET) $(DESTDIR)/$(XORG_DRIVER_INSTALL_DIR) .PHONY = all clean install -- cgit v1.2.3