summaryrefslogtreecommitdiffstats
path: root/configure.ac
Commit message (Collapse)AuthorAgeFilesLines
* configure.ac: Further LLVM fixups.Michel Dänzer2012-07-171-3/+3
| | | | | | | | * Also add mcjit in the non-OpenCL case. * Replace hardcoded llvm-config with $LLVM_CONFIG everywhere. Signed-off-by: Michel Dänzer <[email protected]> Reviewed-by: Tom Stellad <[email protected]>
* configure.ac: Add libLLVMMCJIT to the LLVM_LDFLAGSTom Stellard2012-07-171-1/+1
| | | | | | | This is neccessary for linking the llvmpipe tests. It appears this dependency was introduced by the "wider native register" changes. Reviewed-by: Jose Fonseca <[email protected]>
* Fix linking gallium drivers and with dricore after defadf2b1Jon TURNEY2012-07-131-2/+2
| | | | | | | | | | | | | | | | | | | Commit defadf2b1 erroneously tries to make gallium drivers link with libdricore as a static library, not a shared library Also, change uses of DRI_LIB_DEPS in gallium driver Makefiles to GALLIUM_DRI_LIB_DEPS, so the libraries added are used in the linking the gallium driver Also, fix the path to the libdricore.so symlink, it's made in LIB_DIR, not in the libdricore directory Also repair quoting of dricore settings of DRI_LIB_DEPS and GALLIUM_DRI_LIB_DEPS variables so VERSION is interpolated in configure but TOP and LIB_DIR are interpolated later (where they are known, but VERSION isn't) Signed-off-by: Jon TURNEY <[email protected]> Signed-off-by: Tom Stellard <[email protected]>
* wayland: Stop trying to use make rules from aclocal, just copy and pasteKristian Høgsberg2012-07-131-2/+3
| | | | | | | | | Defeated by autotool, copy and paste to the rescue. https://bugs.freedesktop.org/show_bug.cgi?id=51997 https://bugs.freedesktop.org/show_bug.cgi?id=51531 Signed-off-by: Kristian Høgsberg <[email protected]>
* automake: convert libglapiJon TURNEY2012-07-131-5/+1
| | | | | | | | | | | | | | | | | | | * "configure substitutions are not allowed in _SOURCES variables" in automake, so remove the AC_SUBST'ed GLAPI_ASM_SOURCES and instead use some AM_CONDITIONALS to choose which asm sources are used * Change GLAPI_LIB to point to the .la file in other Makefile.am files, and make a link to the .a file for the convenience of other Makefiles which have not yet been converted to automake v2: - Use AM_CPPFLAGS for cleaner build output - EXTRA_SOURCES is not needed - Remove libglapi.a compatibility link on clean Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Tested-by: Matt Turner <[email protected]>
* Rename X86-64_API -> X86_64_APIJon TURNEY2012-07-131-1/+1
| | | | | | | | automake doesn't allow hyphens in variable names Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Tested-by: Matt Turner <[email protected]>
* Link dri drivers with mesa or dricore libtool libraryJon TURNEY2012-07-131-3/+8
| | | | | | | | | | | | | | | | | Now mesa/drivers/dri is converted to automake, we want to update DRI_LIB_DEPS so that we link with the libmesa or libdricore libtool library, as appropriate. However, this is complicated by the fact that gallium/targets is not (yet) converted, so we can't share the DRI_LIB_DEPS autoconf variable with that anymore. Add an additional autoconf variable GALLIUM_DRI_LIB_DEPS, which is now used in gallium/targets/Makefile.dri, to link with the libdircore or libmesa native library. v2: libdricore$VERSION.a needs to be libdricore$(VERSION).a Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Tested-by: Matt Turner <[email protected]>
* Remove unused MESA_MODULES autoconf variableJon TURNEY2012-07-131-3/+0
| | | | | | Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Tested-by: Matt Turner <[email protected]>
* automake: convert libglslJon TURNEY2012-07-131-0/+2
| | | | | | | | | | | | | | | | | | | | v2: Use AM_V_GEN to silence generated code rules. Add BUILT_SOURCES to CLEANFILES v3: - Fix an accidental // in a path - Use automake make rules for lex/yacc rather than writing our own - Update .gitignore appropriately - Build a libglcpp convenience library rather than awkwardly including the files in libglsl and delegating the generation - Remove libglsl.a compatibility link on clean v4: - Automake's rules for lex/yacc make .cc if source is .ll or .yy, and apparently we must use those extensions "because of scons", so update everywhere glsl_parser.cpp -> glsl_parser.cc and glsl_lexer.cpp -> glsl_lexer.cc. This fixes 'make tarballs' and building with dricore enabled. Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Tested-by: Matt Turner <[email protected]>
* automake: convert libOSmesaLaurent Carlier2012-07-131-0/+5
| | | | | | | | | | | | | This also currently fix the installation of libOSmesa. v2: Remove old Makefile, libOSmesa is now versioned, fix typos v3: Keep config substitution alphabetized v4: Update .gitignore v5: Libraries will be in the builddir, not the srcdir. Reviewed-by: Jon TURNEY <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Tested-by: Matt Turner <[email protected]>
* mesa: Require current libxcb.Eric Anholt2012-07-121-20/+1
| | | | | | | | | | Without that, people with buggy apps that looked at just the server string for GLX_ARB_create_context would call this function that just threw an error when you tried to make a context. Google shows plenty of complaints about this. Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* i965: Add hardware context support.Kenneth Graunke2012-07-101-1/+1
| | | | | | | | | | | With fixes and updates from Ben Widawsky and comments from Paul Berry. v2: Use drm_intel_gem_context_destroy to destroy hardware context; remove useless initialization of hw_ctx, both suggested by Eric. Signed-off-by: Kenneth Graunke <[email protected]> Signed-off-by: Ben Widawsky <[email protected]> Acked-by: Paul Berry <[email protected]>
* clover: Add --with-clang-libdir option and verify CLANG_RESOURCE_DIRTom Stellard2012-06-221-0/+17
| | | | | | | | | | | | | | $CLANG_RESOURCE_DIR is the directory that contains all resources needed by clang to compile programs. When clover uses clang to compile kernels it needs to specify a resource dir, so that clang can find its internal headers (e.g. stddef.h). clang defines $CLANG_RESOURCE_DIR as $CLANG_LIBDIR/clang/$CLANG_VERSION This patch adds the --with-clang-libdir option in order to accommodate clang intalls to non-standard locations, and it also adds a check to the configure script to verify that $CLANG_RESOURCE_DIR/include contains the necessary header files.
* dricore: Turn it into a normal library.Eric Anholt2012-06-211-12/+2
| | | | | | | | | | | | Our intention is still that it's not abi stable, so make the package version number get included in the library name. Now you can parallel install dricore-using drivers from multiple mesa versions. We can put it into lib now that we're following library versioning rules (assuming that ABIs don't change within a single Mesa point release). LD_LIBRARY_PATH still doesn't work with a non-/, non-/usr prefix because libtool uses rpath instead of runpath for nonstandard prefixes.
* mesa: Move GL header installation to automake.Eric Anholt2012-06-211-6/+1
| | | | | This cuts some cruft related to osmesa where we were being careful to not install headers twice.
* automake: Move the master Mesa makefile to Makefile.old.Eric Anholt2012-06-211-0/+1
| | | | | This will let me incrementally move stuff to automake without converting libmesa.a all at once.
* automake: Convert osmesa.pc to be generated by configure.Eric Anholt2012-06-211-1/+2
|
* mesa: Convert gl.pc to be generated by configure.Eric Anholt2012-06-211-1/+2
| | | | This saves a step of mashing variables around in our Makefile.
* automake: Convert src/mesa/drivers/x11/Makefile to automake.Eric Anholt2012-06-211-1/+2
| | | | | | | | | The weird versioning of the libGL where the package version was sort of expressed as a big integer is dropped. libtool didn't like the 0 prefix, and it didn't really make sense anyway -- if you interpret it as an integer version number, old Mesa 071200 was bigger than current Mesa 08100. Instead, just bump the minor version and drop the patchlevel.
* automake: Convert src/gallium/Makefile to automake.Eric Anholt2012-06-211-0/+1
|
* automake: Convert src/mapi/glapi/gen/Makefile to automake.Eric Anholt2012-06-211-0/+1
|
* automake: Convert src/mesa/drivers/Makefile to automake.Eric Anholt2012-06-211-0/+1
|
* automake: Directly generate configs/current instead of symlinking from it.Eric Anholt2012-06-211-9/+1
|
* automake: Convert gen_matypes building to automake.Eric Anholt2012-06-211-0/+2
|
* make: Fold ASM_CFLAGS into DEFINES.Eric Anholt2012-06-211-9/+7
| | | | | | Every place that uses ASM_FLAGS already uses DEFINES. Not including it in DEFINES is just a way to screw up potential users, as I've done several times while working on the build system.
* automake: Convert src/egl/Makefile to automake.Eric Anholt2012-06-211-0/+1
|
* automake: Don't warn on gmake portability issues.Eric Anholt2012-06-211-1/+1
| | | | | | | | | Even pre-automake, we rely on gmake features for pattern substitutions, and replacing those with reams more make code is not interesting. This will let us turn the old Makefiles using pattern substitutions into automake without spewing warnings. Reviewed-by: Dan Nicholson <[email protected]>
* mesa/tests: Add tests for the generated dispatch tableIan Romanick2012-06-131-0/+1
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* mesa/tests: Add tests for _mesa_lookup_enum_by_{name,nr} functionsIan Romanick2012-06-131-0/+1
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glx: Move tests from tests/glx to src/glx/testsIan Romanick2012-06-131-3/+2
| | | | | | | This matches the organization of other unit tests in Mesa. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* automake: Add AM_PROG_AR before LT_INIT to silence a lot of warnings.Kenneth Graunke2012-06-111-0/+2
| | | | | | | The warnings appear to occur with newer automake (probably 1.12). Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* configure.ac: Add --with-(gl|glu|osmesa)-lib-name optionsBrad King2012-06-111-7/+22
| | | | | | | | These allow one to mangle the library names, without also mangling the symbol names, to make them distinct from other GL libraries on the system. Reviewed-by: Kenneth Graunke <[email protected]>
* automake: Merge the dricore libglsl build into libdricore.Eric Anholt2012-06-111-5/+3
| | | | | | | | | | | | | Now we have just one library of "all of Mesa core" instead of both libdricore and libglsl that drivers link against. I did this change in a sort of nonrecursive make fashion: the generated files are still produced in the non-automake build, like the rest of dricore, but the GLSL files are stuffed into libdricore without building a convenience library in src/glsl (even though we could now). This would make a bit more sense if glsl was just another dir under src/mesa, because right now I had to contort the prefix variable name to look another ../ level up.
* automake: Convert src/Makefile to automake.Eric Anholt2012-06-111-0/+1
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* automake: Move top-level makefile to automake.Eric Anholt2012-06-111-0/+1
| | | | | | | | | This is part of a series to fix our build issues in the automake case by hooking up the automatic Makefile regeneration support. The extract_git_sha1 is moved into src/mesa/Makefile so that we get correct dependency generation. Reviewed-by: Kenneth Graunke <[email protected]>
* mesa: Move the version information right into configure.ac.Eric Anholt2012-06-111-7/+1
| | | | | | Nothing else called version.mk. Reviewed-by: Kenneth Graunke <[email protected]>
* configure.ac: Fail if egl x11 platform dependencies are not availableKristian Høgsberg2012-06-051-28/+39
| | | | | | | | | | Currently, if you pass --with-egl-platforms=x11 but xcb-dri2 isn't available we just silently fail and disables building the EGL DRI2 driver. This commit cleans up the EGL platfrom checking and fails if a selected platform can't find its required dependencies. Reviewed-by: Eric Anholt <[email protected]>
* automake: use -m32 in CCASFLAGS when using --enable-32-bitTapani Pälli2012-06-011-0/+1
| | | | | | | this fixes libdricore directory build with --enable-32-bit on a x86_64 system Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* r600g: compute support for evergreenAdam Rak2012-06-011-1/+6
| | | | | | | | | Tom Stellard: - Updated for gallium interface changes - Fixed a few bugs: + Set the loop counter + Calculate the correct number of pipes - Added hooks into the LLVM compiler
* clover: Link to the necessary LLVM and Clang libsTom Stellard2012-06-011-0/+3
|
* configure.ac: Add variables LLVM_CPPFLAGS and LLVM_LIBDIRTom Stellard2012-06-011-0/+4
|
* configure.ac: Add option for libclc pathTom Stellard2012-06-011-0/+8
|
* configure.ac: Add HAVE_OPENCL AM_CONDITIONAL v2Tom Stellard2012-06-011-0/+1
| | | | | | | | v2: - Drop HAVE_OPENCL variable for non-automake builds - s/HAVE_OPENCL/HAVE_GALLIUM_COMPUTE Reviewed-by: Francisco Jerez <[email protected]>
* automake: Check for 'indent' and fall back to 'cat' if not found.Kenneth Graunke2012-05-301-0/+5
| | | | | | | | | | | The glapi generator code uses indent to produce more readable code. However, we don't want to make GNU indent a hard build dependency; check for it in configure.ac and fall back to 'cat' if it's not available. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50484 Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Matt Turner <[email protected]> Acked-by: Ben Widawsky <[email protected]>
* automake: Convert dricore building to automake.Eric Anholt2012-05-291-0/+12
| | | | | | | | | | | 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 <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* automake: Rename variables in sources.mak to be automake compatible.Eric Anholt2012-05-291-5/+5
| | | | | | | | *_SOURCES is reserved for files lists for particular automake targets. Also, "-" in the variable names is not allowed. Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* mesa: Remove the generated glapi from source control, and just build it.Eric Anholt2012-05-291-1/+1
| | | | | | | | | | | Mesa already always depends on python to build. The checked in changes are not reviewed (because any trivial change rewrites the world). We also have been pushing commits between xml change and regen where at-build-time xml-generated code disagrees with committed xml-generated code. And worst of all, sometimes we ("I") check in *stale* xml-generated code. Acked-by: Ian Romanick <[email protected]>
* i965: Completely annotate the batch bo when aub dumping.Paul Berry2012-05-221-1/+1
| | | | | | | | | | | | | | | | | | | Previously, when the environment variable INTEL_DEBUG=aub was set, mesa would simply instruct DRM to start dumping data to an .aub file, but we would not provide DRM with any information about the format of the data in various buffers. As a result, a lot of the data in the generate .aub file would be unannotated, making further data analysis difficult. This patch causes the entire contents of each batch buffer to be annotated using the data in brw->state_batch_list (which was previously used only to annotate the output of INTEL_DEBUG=bat). This includes data that was allocated by brw_state_batch, such as binding tables, surface and sampler states, depth/stencil state, and so on. The new annotation mechanism requires DRM version 2.4.34. Reviewed-by: Eric Anholt <[email protected]>
* Filter out -Wcovered-switch-default from LLVM_CFLAGSojab2012-05-211-1/+1
| | | | Signed-off-by: José Fonseca <[email protected]>
* configure.ac: Fix typos in the r600-llvm-compiler optionHomer Hsing2012-05-151-2/+2
| | | | Signed-off-by: Tom Stellard <[email protected]>