Mesa source no longer required when building Xorg

[Dan Nicholson]

On Wed, May 21, 2008 at 2:40 PM, Jie Luo <clotho67 at gmail.com> wrote:
>
> A build fix to allow build libglx.so without mesa.

I just hit this myself.

> diff --git a/configure.ac b/configure.ac
> index 8a1b73f..69f44ba 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -514,9 +514,6 @@ AC_ARG_ENABLE(null-root-cursor,
> AS_HELP_STRING([--enable-null-root-cursor], [Use
>                                  [NULL_ROOT_CURSOR=no])
>
>  dnl GLX build options
> -AC_ARG_WITH(mesa-source,
> AS_HELP_STRING([--with-mesa-source=MESA_SOURCE], [Path to Mesa source
> tree]),
> -                                [ MESA_SOURCE="$withval" ],
> -                                [ MESA_SOURCE="" ])
>  AC_ARG_WITH(dri-driver-path,  AS_HELP_STRING([--with-dri-driver-path=PATH],
> [Path to DRI drivers (default: ${libdir}/dri)]),
>                                [ DRI_DRIVER_PATH="$withval" ],
>                                [ DRI_DRIVER_PATH="${libdir}/dri" ])
> @@ -850,7 +847,7 @@ if test "x$RES" = xyes; then
>        REQUIRED_MODULES="$REQUIRED_MODULES resourceproto"
>  fi
>
> -if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
> +if test "x$GLX" = xyes; then
>        PKG_CHECK_MODULES([XLIB], [x11])
>        PKG_CHECK_MODULES([GL], [glproto >= 1.4.9 gl >= 7.1.0])
>        AC_SUBST(XLIB_CFLAGS)

This test is definitely right for xorg, but I don't think we can kill
off the --with-mesa-source option yet. According to Kristian's commit
message:

"""
The --with-mesa-source configure option is still around since other
parts of the server (XGL and DMX - grep for MESA_SOURCE) need that,
but for common case of building with GLX and AIGLX support, that
option is no longer needed.
"""

--
Dan