summaryrefslogtreecommitdiffstats
path: root/configure.ac
Commit message (Collapse)AuthorAgeFilesLines
* automake: convert vgapiMatt Turner2012-08-241-0/+4
|
* build: Check for bison-generated file before bailing because of no bisonMatt Turner2012-08-241-1/+1
| | | | | | .y/.c was a typo. Reviewed-by: Ian Romanick <[email protected]>
* mesa/dlopen: use HAVE_DLOPEN instead of _GNU_SOURCETapani Pälli2012-08-241-2/+3
| | | | | | | | | | | | | Patches changes mesa to use 'HAVE_DLOPEN' defined by configure and Android.mk instead of _GNU_SOURCE for detecting dlopen capability. This makes dlopen to work also on Android where _GNU_SOURCE is not defined. [mattst88] v2: HAVE_DLOPEN is sufficient for including dlfcn.h, remove mingw/blrts checks around dlfcn.h inclusion. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Matt Turner <[email protected]> Signed-off-by: Tapani Pälli <[email protected]>
* build: Only add links to .so files if we're building themMatt Turner2012-08-241-0/+2
| | | | | | Xlib-GLX and OSMesa support static building. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=53962
* build: Replace OSMESA_VERSION with generic VERSION_NUMBERMatt Turner2012-08-241-3/+4
| | | | Can be used by other modules.
* build: Order AC_CONFIG_FILES listMatt Turner2012-08-241-21/+21
| | | | | Makefiles before .pc files before directories. Alphabetize files of the same type.
* build: Only build libmesa.la when neededMatt Turner2012-08-241-0/+2
| | | | Namely, for Xlib-GLX, OSMesa, or test programs.
* build: Remove duplicate DRI automake conditionalsMatt Turner2012-08-241-4/+1
|
* build: Remove GLU_DIRSMatt Turner2012-08-241-2/+0
|
* automake: convert es1apiMatt Turner2012-08-231-0/+2
|
* automake: convert es2apiMatt Turner2012-08-231-0/+2
|
* build: Link DRI drivers with dricore in case of no direct renderingMatt Turner2012-08-221-10/+3
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* build: Only build libmesagallium.la if building GalliumMatt Turner2012-08-221-0/+1
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* build: Put mapi/shared-glapi in CORE_DIRSMatt Turner2012-08-221-12/+1
| | | | | | | | SRC_DIRS was overwritten (visible in the second hunk). Also don't require mapi/shared-glapi to be built for GLES. Reviewed-by: Kenneth Graunke <[email protected]>
* build: Only allow shared-glapi with DRIMatt Turner2012-08-221-18/+25
| | | | | Tested-by: Brian Paul <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* build: Set sensible DRI/X11/OSMesa defaultsMatt Turner2012-08-221-53/+19
| | | | | Tested-by: Brian Paul <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* build: Print whether shared-glapi is enabledMatt Turner2012-08-221-0/+1
| | | | | Tested-by: Brian Paul <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* build: Remove deprecated --with-driver= flagMatt Turner2012-08-221-31/+6
| | | | | Tested-by: Brian Paul <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* build: Remove EXTRA_LIB_PATHMatt Turner2012-08-161-5/+1
| | | | You can add extra library paths to LDFLAGS directly.
* build: Require X11 pkg-config filesMatt Turner2012-08-161-69/+16
|
* configure.ac: bump libdrm_radeon requirement to 2.6.38Marek Olšák2012-08-151-1/+1
|
* configure: Check xcb version when X11 pkgconfig existsTom Stellard2012-08-121-0/+1
| | | | | | | | Commit 6882381a2efbdf06b7002d11468c94b9964c2bc8 added a dependency on a newer version of xcb, but the version check wasn't added in all the necessary places. Reviewed-by: Kenneth Graunke <[email protected]>
* Revert "mesa: Remove C++11 narrowing warnings"Chad Versace2012-08-101-3/+0
| | | | | | | | | | | | This reverts commit 9f5a5d541d5c1ff2e440791ba8ff44d0233daeb4. Fixes the following build error on GCC 4.2.3: cc1plus: error: unrecognized command line option "-Wno-narrowing" The GCC Manual incorrectly stated that commit 9f5a5d54 woulde be safe for old versions of GCC. Reported-by: Andy Furniss <[email protected]> Signed-off-by: Chad Versace <[email protected]>
* mesa: Remove C++11 narrowing warningsChad Versace2012-08-101-0/+3
| | | | | | | | | | | | | | | | | | | Add -Wno-narrowing to CXXFLAGS for gcc. It is safe to add this flag even for versions of gcc that don't recognize it. From the GCC Manual [1]: "[GCC] allows the use of new -Wno- options with old compilers". This removes warnings of the form warning: narrowing conversion of X from 'int' to 'float' inside { } is ill-formed in C++11 [-Wnarrowing] in ff_fragment_shader.cpp and gen6_blorp.cpp of the form. When building i965, I observed no other difference in the build output. [1] http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html Reviewed-by: Kenneth Graunke <[email protected]> Signed-off-by: Chad Versace <[email protected]>
* Make shared-glapi the defaultIan Romanick2012-08-081-2/+2
| | | | | | | | | | | You can't practically have desktop OpenGL and OpenGL ES on the same system without this. The benefits of not having it (e.g., a more compact dispatch table) are irrelevant. v2: Don't mark shared-glapi as experimental. Review suggestion by Chad. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Chad Versace <[email protected]>
* mesa/tests: Add tests for the generated shared-glapi dispatch tableIan Romanick2012-08-081-0/+1
| | | | | | | | | These are largely based on the src/mapi/glapi/tests. However, shared-glapi provides less external visibility into the dispatch table, so there is less to test. Also, shared-glapi does not implement _glapi_get_proc_name, so that test was removed. Signed-off-by: Ian Romanick <[email protected]>
* radeonsi: initial VDPAU targetChristian König2012-08-021-1/+1
| | | | | | | | Windowed speed is of course way to slow, but fullscreen works like a charm now. Signed-off-by: Christian König <[email protected]> Reviewed-by: Michel Dänzer <[email protected]>
* 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]>