summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac5
-rw-r--r--src/Makefile.am5
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 8bbefe7..e7a2e07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,9 +23,8 @@ XORG_WITH_XMLTO(0.0.20)
XORG_WITH_FOP
XORG_CHECK_SGML_DOCTOOLS(1.5)
-# Checks for pkg-config packages
-PKG_CHECK_MODULES(SM, [ice >= 1.0.5] xproto)
-PKG_CHECK_MODULES(XTRANS, xtrans)
+# Obtain compiler/linker options for depedencies
+PKG_CHECK_MODULES(SM, [ice >= 1.0.5] xproto xtrans)
# Needed to check for TCP & IPv6 support and set flags appropriately
XTRANS_CONNECTION_FLAGS
diff --git a/src/Makefile.am b/src/Makefile.am
index 1098679..a094ccc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
lib_LTLIBRARIES=libSM.la
-AM_CFLAGS= $(CWARNFLAGS) -I${top_srcdir}/include $(SM_CFLAGS) $(XTRANS_CFLAGS)
+AM_CPPFLAGS = -I${top_srcdir}/include
+AM_CFLAGS = $(CWARNFLAGS) $(SM_CFLAGS)
if WITH_LIBUUID
AM_CFLAGS += $(LIBUUID_CFLAGS) -DHAVE_LIBUUID
@@ -8,7 +9,7 @@ endif
libSM_la_LDFLAGS = -version-number 6:0:1 -no-undefined
-libSM_la_LIBADD = $(SM_LIBS) $(XTRANS_LIBS)
+libSM_la_LIBADD = $(SM_LIBS)
if WITH_LIBUUID
libSM_la_LIBADD += $(LIBUUID_LIBS)