[Mesa-dev] [PATCH] automake: convert libOSmesa building

[Matt Turner]

On Sat, Jun 23, 2012 at 8:55 PM, Laurent Carlier <lordheavym at gmail.com> wrote:
> This also currently fix the installation of libOSmesa.
>
> v2: Remove old Makefile, libOSmesa is now versioned, fix typos
> ---
>  configure.ac                        |  5 ++++
>  src/mesa/drivers/osmesa/Makefile    | 51 -------------------------------------
>  src/mesa/drivers/osmesa/Makefile.am | 50 ++++++++++++++++++++++++++++++++++++
>  3 files changed, 55 insertions(+), 51 deletions(-)
>  delete mode 100644 src/mesa/drivers/osmesa/Makefile
>  create mode 100644 src/mesa/drivers/osmesa/Makefile.am
>
> diff --git a/configure.ac b/configure.ac
> index 46265a2..44756a1 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1370,10 +1370,14 @@ if test "x$enable_osmesa" = xyes; then
>     OSMESA_MESA_DEPS=""
>     OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
>  fi
> +
> +OSMESA_VERSION=`echo "$VERSION" | $SED 's/\./:/g'`
> +
>  AC_SUBST([OSMESA_LIB_DEPS])
>  AC_SUBST([OSMESA_MESA_DEPS])
>  AC_SUBST([OSMESA_PC_REQ])
>  AC_SUBST([OSMESA_PC_LIB_PRIV])
> +AC_SUBST([OSMESA_VERSION])
>
>  dnl
>  dnl gbm configuration
> @@ -2189,6 +2193,7 @@ AC_CONFIG_FILES([configs/current
>                src/mesa/drivers/dri/radeon/Makefile
>                src/mesa/drivers/dri/swrast/Makefile
>                src/mesa/drivers/x11/Makefile
> +               src/mesa/drivers/osmesa/Makefile
>                src/mesa/gl.pc
>                src/mesa/osmesa.pc])

Nit pick, but let's try to keep this alphabetized.