summaryrefslogtreecommitdiffstats
path: root/configure.ac
Commit message (Collapse)AuthorAgeFilesLines
* configure.ac: Remove extra ;;Matt Turner2012-08-011-1/+1
| | | | Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=53053
* configure.ac: Don't duplicate CFLAGSMatt Turner2012-08-011-4/+0
| | | | | | | | | | These assignments caused CFLAGS specified on the configure line to appear twice in the final CFLAGS. Removing them makes the behavior reasonable -- USER_CFLAGS are appended at the end of CFLAGS, allowing the builder to override flags added by configure.ac like -fno-strict-aliasing. Reviewed-by: Adam Jackson <[email protected]>
* configure.ac: Remove contractions to stop breaking syntax highlightingMatt Turner2012-08-011-4/+4
| | | | Reviewed-by: Adam Jackson <[email protected]>
* configure.ac: remove remnants of ppc asm supportMatt Turner2012-08-011-7/+0
| | | | | | Missed by d387899388bd7090bda50593e35f8ed3cb730c47. Reviewed-by: Adam Jackson <[email protected]>
* linux: Default to dri not xlib on all archesAdam Jackson2012-08-011-3/+1
| | | | | | | | Even on s390{,x} where there's no video card, you still want this so GLX protocol works. Reviewed-by: Matt Turner <[email protected]> Signed-off-by: Adam Jackson <[email protected]>
* Move installing osmesa.pc to drivers/osmesaJon TURNEY2012-07-311-2/+1
| | | | | | | | | | | | | | | | Move installing osmesa.pc to drivers/osmesa, where it belongs better This also restores the installation of gl.pc if we are building osmesa at the same time as libGL, which was broken in commit 39785488 when the .pc installation was converted to automake v2: Remove HAVE_OSMESA_DRIVER automake conditional, it's now pointless as we will only be building in the drivers/osmesa directory if the condition it checked was true. Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* automake: Remove OPT_FLAGS.Eric Anholt2012-07-261-7/+2
| | | | | | | | | | If you want to change your compiler arguments, just set CFLAGS/CXXFLAGS. Having Mesa have this separate variable is a great way to have your arguments not thoroughly propagated to all compiler invocations. Reviewed-by: Ian Romanick <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* automake: Remove ARCH_FLAGS.Eric Anholt2012-07-261-6/+2
| | | | | | | | | | In all current uses, it was appended to CFLAGS, which already had -m32. If you want to do some other flag supplied to compiler invocations, there's CFLAGS/CXXFLAGS. Reviewed-by: Ian Romanick <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* Remove redundant osmesa shared library install from Makefile.oldJon TURNEY2012-07-251-2/+0
| | | | | | | | | | | | | | | | Since osmesa now has been converted to Makefile.am, an appropriate install: rule is generated to install the shared libary, so we no longer need to do that in src/mesa/Makefile.old This leaves nothing in src/mesa/Makefile.old but the tags: rule, so move that to Makefile.am and remove Makefile.old Also, nothing now uses OSMESA_LIB_GLOB anymore, so remove it Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* automake: Honor GL_LIB for mangled/custom lib namesBrad King2012-07-231-1/+0
| | | | | | | | | | | | | | | | Commit 2d4b77c7 (automake: Convert src/mesa/drivers/x11/Makefile to automake, 2012-06-12) dropped the old Makefile, which used GL_LIB, and replaced it with a Makefile.am hard-coding the name "GL". This broke handling of --enable-mangling and --with-gl-lib-name options which depend on GL_LIB to specify the GL library name. Use "@GL_LIB@" in src/mesa/drivers/x11/Makefile.am to configure the library name. Also use this approach to simplify src/glx/Makefile.am and drop the HAVE_MANGLED_GL conditional. While at it, fix the compatibility link we create in "lib" for the software-only driver to use version GL_MAJOR instead of hard-coding "1". Reviewed-by: Dan Nicholson <[email protected]>
* pipe_loader: Try to connect with the X server before probing pciids v2Tom Stellard2012-07-231-0/+6
| | | | | | | | | | | | | | | | When X is running it is neccesary for pipe_loader to authenticate with DRM, in order to be able to use the device. This makes it possible to run OpenCL programs while X is running. v2: - Fix C++ style comments - Drop Xlib-xcb dependency - Close the X connection when done - Split auth code into separate function Reviewed-by: Michel Dänzer <[email protected]> Reviewed-by: Francisco Jerez <[email protected]>
* configure.ac: Add --with-llvm-prefix optionTom Stellard2012-07-231-1/+12
| | | | | This option allows you to specify the llvm install prefix. It is useful for switching between different versions of LLVM.
* autoconf: Only kink mcjit component when available.José Fonseca2012-07-211-2/+6
| | | | | Should fix build failures with older LLVM version, but only tested on LLVM 3.1.
* 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]>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 00:07:12 +0000