diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-30 12:28:02 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-30 12:28:02 +0200 |
| commit | e48563d326cebfe5d7110b64b922120dd37ffe4c (patch) | |
| tree | 5439271c5a4211e1d7b6261147a5322e31eaac29 /mesalib/configure.ac | |
| parent | 64385e98e48e5d44d0d5a8923fc9f7049e4ea7ab (diff) | |
| parent | e4580373a81894c451e5933b24906a075828b77e (diff) | |
| download | vcxsrv-e48563d326cebfe5d7110b64b922120dd37ffe4c.tar.gz vcxsrv-e48563d326cebfe5d7110b64b922120dd37ffe4c.tar.bz2 vcxsrv-e48563d326cebfe5d7110b64b922120dd37ffe4c.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 5ccf77d65..20bd00b67 100644 --- a/mesalib/configure.ac +++ b/mesalib/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 @@ -436,7 +437,7 @@ AC_ARG_ENABLE([asm], ) asm_arch="" ASM_FLAGS="" -MESA_ASM_SOURCES="" +MESA_ASM_FILES="" GLAPI_ASM_SOURCES="" AC_MSG_CHECKING([whether to enable assembly]) test "x$enable_asm" = xno && AC_MSG_RESULT([no]) @@ -485,19 +486,19 @@ if test "x$enable_asm" = xyes; then case "$asm_arch" in x86) ASM_FLAGS="-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM" - MESA_ASM_SOURCES='$(X86_SOURCES)' + MESA_ASM_FILES='$(X86_FILES)' GLAPI_ASM_SOURCES='$(X86_API)' AC_MSG_RESULT([yes, x86]) ;; x86_64) ASM_FLAGS="-DUSE_X86_64_ASM" - MESA_ASM_SOURCES='$(X86-64_SOURCES)' + MESA_ASM_FILES='$(X86_64_FILES)' GLAPI_ASM_SOURCES='$(X86-64_API)' AC_MSG_RESULT([yes, x86_64]) ;; sparc) ASM_FLAGS="-DUSE_SPARC_ASM" - MESA_ASM_SOURCES='$(SPARC_SOURCES)' + MESA_ASM_FILES='$(SPARC_FILES)' GLAPI_ASM_SOURCES='$(SPARC_API)' AC_MSG_RESULT([yes, sparc]) ;; @@ -507,7 +508,7 @@ if test "x$enable_asm" = xyes; then esac fi AC_SUBST([ASM_FLAGS]) -AC_SUBST([MESA_ASM_SOURCES]) +AC_SUBST([MESA_ASM_FILES]) AC_SUBST([GLAPI_ASM_SOURCES]) dnl PIC code macro @@ -836,7 +837,7 @@ fi # build glsl and mesa if OpenGL or OpenGL ES is enabled case "x$enable_opengl$enable_gles1$enable_gles2" in x*yes*) - CORE_DIRS="$CORE_DIRS glsl mesa" + CORE_DIRS="mapi/glapi/gen $CORE_DIRS glsl mesa" ;; esac @@ -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 |