[PATCH 2/2] configure: read back libXfont flags and set the server accordingly

[Tiago Vignatti]

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
It requires libXfont be bumped to 1.4.2 version.

 configure.ac   |    8 ++++++--
 dix/dixfonts.c |    4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8ba114e..2bf1570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -793,7 +793,7 @@ APPLEWMPROTO="applewmproto >= 1.4"
 
 dnl Core modules for most extensions, et al.
 REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.1] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xextproto >= 7.0.99.3] [xproto >= 7.0.17] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] fontsproto [inputproto >= 1.9.99.902] [kbproto >= 1.0.3]"
-REQUIRED_LIBS="xfont xau [pixman-1 >= 0.15.20]"
+REQUIRED_LIBS="xau [pixman-1 >= 0.15.20]"
 
 dnl List of libraries that require a specific version
 LIBAPPLEWM="applewm >= 1.4"
@@ -802,6 +802,7 @@ LIBDRI="dri >= 7.8.0"
 LIBDRM="libdrm >= 2.3.0"
 LIBGL="gl >= 7.1.0"
 LIBXEXT="xext >= 1.0.99.4"
+LIBXFONT="xfont >= 1.4.2"
 LIBXI="xi >= 1.2.99.1"
 LIBXTST="xtst >= 1.0.99.2"
 LIBPCIACCESS="pciaccess >= 0.8.0"
@@ -809,6 +810,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])
@@ -2145,7 +2149,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])
 
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index b6d54f8..a0fa36e 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1928,7 +1928,11 @@ InitFonts (void)
 
     BuiltinRegisterFpeFunctions();
     FontFileRegisterFpeFunctions();
+
+/* defined by libXfont */
+#ifdef FONTSERVER
     fs_register_fpe_functions();
+#endif
 }
 
 int
-- 
1.7.1.226.g770c5