This was done for the wrong reasons and fixed in commit:
87c96993d17812a55d92ef32a91083614e258f02
where the libfs.pc.in was fixed.
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
---
configure.ac | 7 +------
src/Makefile.am | 11 ++++++++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index 10140dc..20f8069 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,12 +42,7 @@ XORG_DEFAULT_OPTIONS
XORG_CHECK_MALLOC_ZERO
# Obtain compiler/linker options for depedencies
-PKG_CHECK_MODULES(FS, xproto fontsproto)
-
-#
-# Split out so we don't include xtrans C flags in fs.pc
-#
-PKG_CHECK_MODULES(XTRANS, xtrans)
+PKG_CHECK_MODULES(FS, xproto fontsproto xtrans)
# Find needed libraries for TCP sockets (pre-pended in $LIBS)
XTRANS_CONNECTION_FLAGS
diff --git a/src/Makefile.am b/src/Makefile.am
index ed70165..06e958f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,9 +29,14 @@ libFS_la_SOURCES = \
FSSynchro.c \
fs_transport.c
-AM_CFLAGS = $(CWARNFLAGS) $(FS_CFLAGS) $(XTRANS_CFLAGS) $(MALLOC_ZERO_CFLAGS) \
- -DFS_t -DTRANS_CLIENT
-libFS_la_LIBADD = $(FS_LIBS) $(XTRANS_LIBS)
+AM_CFLAGS = \
+ $(CWARNFLAGS) \
+ $(FS_CFLAGS) \
+ $(MALLOC_ZERO_CFLAGS) \
+ -DFS_t \
+ -DTRANS_CLIENT
+
+libFS_la_LIBADD = $(FS_LIBS)
INCLUDES = -I$(top_srcdir)/include/X11/fonts
--
1.6.0.4
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
