diff options
| author | Eric Anholt <eric@anholt.net> | 2012-05-24 13:59:21 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-05-29 12:39:48 -0700 |
| commit | f9d1562f356a66b70f13324e3360d63e8602a35f (patch) | |
| tree | c1c9d0f0ce872528488dee7010fdd1b038162a05 /configure.ac | |
| parent | e86c40a84d241b954594f5ae7df9b9c3fc797a4e (diff) | |
| download | external_mesa3d-f9d1562f356a66b70f13324e3360d63e8602a35f.zip external_mesa3d-f9d1562f356a66b70f13324e3360d63e8602a35f.tar.gz external_mesa3d-f9d1562f356a66b70f13324e3360d63e8602a35f.tar.bz2 | |
automake: Convert dricore building to automake.
This is performed in a subdirectory to avoid needing to convert all of
src/mesa/Makefile in one go.
I can now cherry-pick a commit containing glapi XML changes, do "(cd
src/mapi/glapi/gen && make) && make", and get a working driver.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 6830bde..20bd00b 100644 --- a/configure.ac +++ b/configure.ac @@ -50,6 +50,7 @@ AC_PROG_CPP AC_PROG_CC AC_PROG_CXX AM_PROG_CC_C_O +AM_PROG_AS AC_CHECK_PROGS([MAKE], [gmake make]) AC_CHECK_PROGS([PYTHON2], [python2 python]) AC_PROG_SED @@ -1087,7 +1088,9 @@ if test "x$enable_dri" = xyes && test "x$driglx_direct" = xyes ; then DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE' DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE' MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)' + HAVE_DRICORE=yes fi +AM_CONDITIONAL(HAVE_DRICORE, test x$HAVE_DRICORE = xyes) AC_SUBST([DRICORE_LIBS]) AC_SUBST([DRICORE_GLSL_LIBS]) AC_SUBST([DRICORE_LIB_DEPS]) @@ -2074,6 +2077,14 @@ AM_CONDITIONAL(HAVE_LOADER_GALLIUM, test x$enable_gallium_loader = xyes) AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = xyes) AC_SUBST([GALLIUM_MAKE_DIRS]) +AM_CONDITIONAL(HAVE_X11_DRIVER, echo "$DRIVER_DIRS" | grep 'x11' >/dev/null 2>&1) +AM_CONDITIONAL(HAVE_DRI_DRIVER, echo "$DRIVER_DIRS" | grep 'dri' >/dev/null 2>&1) +AM_CONDITIONAL(HAVE_OSMESA_DRIVER, echo "$DRIVER_DIRS" | grep 'osmesa' >/dev/null 2>&1) + +AM_CONDITIONAL(HAVE_X86_ASM, echo "$ASM_FLAGS" | grep 'X86_ASM' >/dev/null 2>&1) +AM_CONDITIONAL(HAVE_X86_64_ASM, echo "$ASM_FLAGS" | grep 'X86_64_ASM' >/dev/null 2>&1) +AM_CONDITIONAL(HAVE_SPARC_ASM, echo "$ASM_FLAGS" | grep 'SPARC_ASM' >/dev/null 2>&1) + dnl prepend CORE_DIRS to SRC_DIRS SRC_DIRS="$CORE_DIRS $SRC_DIRS" @@ -2108,6 +2119,7 @@ AC_CONFIG_FILES([configs/autoconf src/glx/Makefile src/mapi/shared-glapi/Makefile src/gtest/Makefile + src/mesa/libdricore/Makefile src/mesa/drivers/dri/dri.pc src/mesa/drivers/dri/Makefile src/mesa/drivers/dri/common/Makefile |