[PATCH 1/2 v2] dix: use one single function to register fpe fonts
Julien Cristau
jcristau at debian.org
Fri Jun 11 07:15:54 PDT 2010
On Fri, Jun 11, 2010 at 15:35:25 +0300, Tiago Vignatti wrote:
> @@ -810,6 +811,9 @@ LIBGLIB="glib-2.0 >= 2.16"
> LIBUDEV="libudev >= 143"
> LIBSELINUX="libselinux >= 2.0.86"
>
> +PKG_CHECK_MODULES([XFONT], $LIBXFONT)
> +REQUIRED_LIBS="$REQUIRED_LIBS $LIBXFONT"
> +
> if test "x$CONFIG_UDEV" = xyes &&
> { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then
> AC_MSG_ERROR([Hotplugging through both libudev and dbus/hal not allowed])
> @@ -2147,7 +2151,7 @@ AC_SUBST([BUILD_DATE])
> BUILD_TIME="`date +'1%H%M%S'`"
> AC_SUBST([BUILD_TIME])
>
> -DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"
> +DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS $XFONT_CFLAGS"
>
> AC_SUBST([DIX_CFLAGS])
>
Sorry I missed it earlier, but the added PKG_CHECK_MODULES seems
redundant. There's a PKG_CHECK_MODULES for REQUIRED_LIBS anyway, and
its CFLAGS end up in XSERVER_CFLAGS.
Cheers,
Julien
More information about the xorg-devel
mailing list