diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-02-02 19:13:54 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-02-02 19:13:54 -0500 |
| commit | 4852c5bb1603fb6d401fe6895d9318555a8d4523 (patch) | |
| tree | 346775814eee8789864d9aafde247e0af16191ad | |
| parent | 87d34a2f04c9d920da01802cd9707c8107746fa5 (diff) | |
config: splitting ICE and XTRANS compiler options is not required
Simplify configuration by using a single PKG_CHECK_MODULES statement.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 483c389..78c4fba 100644 --- a/configure.ac +++ b/configure.ac @@ -30,8 +30,7 @@ XORG_WITH_FOP XORG_CHECK_SGML_DOCTOOLS(1.5) # Obtain compiler/linker options for depedencies -PKG_CHECK_MODULES(ICE, xproto) -PKG_CHECK_MODULES(XTRANS, xtrans) +PKG_CHECK_MODULES(ICE, xproto xtrans) # Transport selection macro from xtrans.m4 XTRANS_CONNECTION_FLAGS diff --git a/src/Makefile.am b/src/Makefile.am index a5dd7d4..3cbe9c6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,13 +4,12 @@ AM_CPPFLAGS = -I${top_srcdir}/include AM_CFLAGS = \ $(ICE_CFLAGS) \ - $(XTRANS_CFLAGS) \ $(CWARNFLAGS) \ -DICE_t -DTRANS_CLIENT -DTRANS_SERVER libICE_la_LDFLAGS = -version-number 6:3:0 -no-undefined -libICE_la_LIBADD = $(ICE_LIBS) $(XTRANS_LIBS) +libICE_la_LIBADD = $(ICE_LIBS) libICE_la_SOURCES = \ ICElibint.h \ |