[Mesa-dev] [PATCH 01/24] Partially revert "automake: allow only shared builds"

[Emil Velikov]

On 28/03/14 21:21, Matt Turner wrote:
> On Thu, Mar 27, 2014 at 2:00 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
>> 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.
>>
>> Reported-by: Burlen Loring <burlen.loring at gmail.com>
>> ---
>>  configure.ac             | 30 +++++++++++++++++++++++-------
>>  install-gallium-links.mk |  2 ++
>>  install-lib-links.mk     |  2 ++
>>  3 files changed, 27 insertions(+), 7 deletions(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 1e5e496..39330cf 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -284,15 +284,18 @@ dnl Can't have static and shared libraries, default to static if user
>>  dnl explicitly requested. If both disabled, set to static since shared
>>  dnl was explicitly requested.
>>  case "x$enable_static$enable_shared" in
>> -xnoyes )
>> +xyesyes )
> 
> Don't put a space between the token and the )? That's not a style I've
> ever seen.
> 
>> +    AC_MSG_WARN([Cannot build static and shared libraries, disabling shared])
>> +    enable_shared=no
>>      ;;
>> -* )
>> -    AC_MSG_WARN([Messa build supports only shared libraries, enabling shared])
>> +xnono )
>> +    AC_MSG_WARN([Cannot disable both static and shared libraries, enabling shared])
>>      enable_shared=yes
>> -    enable_static=no
>>      ;;
>>  esac
>>
>> +AM_CONDITIONAL(BUILD_SHARED, test "x$enable_shared" = xyes)
>> +
>>  dnl
>>  dnl other compiler options
>>  dnl
>> @@ -773,6 +776,11 @@ PKG_CHECK_MODULES([LIBUDEV], [libudev >= $LIBUDEV_REQUIRED],
>>                    have_libudev=yes, have_libudev=no)
>>
>>  if test "x$enable_dri" = xyes; then
>> +    # DRI must be shared, I think
> 
> Drop the comment?
> 
Both "issues" were in the original code. But if you feel so strongly about
them I will have them changed for rev2 of the series.

-Emil