From 4d8267ef209f29cbfe0075500083a2721a9aa885 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 12 Mar 2014 18:13:02 +0000 Subject: Partially revert "automake: allow only shared builds" Evidently at least static OSMesa is still used as shared one causes substantial increase in the load time for some programs that use it (from seconds up-to ~30min). Rather than forcing everyone to use shared mesa, revert commit a6efbac9fb502c4f0166e7a0680b6828e1f6926c and default to shared build when both shared and static are disabled. v2: Whitespace cleanup, drop silly comment. Reported-by: Burlen Loring Reviewed-by: Matt Turner --- install-gallium-links.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'install-gallium-links.mk') diff --git a/install-gallium-links.mk b/install-gallium-links.mk index 5ee923b25df..6ed8a24a707 100644 --- a/install-gallium-links.mk +++ b/install-gallium-links.mk @@ -1,6 +1,7 @@ # Provide compatibility with scripts for the old Mesa build system for # a while by putting a link to the driver into /lib of the build tree. +if BUILD_SHARED if HAVE_COMPAT_SYMLINKS all-local : .libs/install-gallium-links @@ -23,3 +24,4 @@ all-local : .libs/install-gallium-links fi; \ done && touch $@ endif +endif -- cgit v1.2.1