From 16b198d9f2e5b2261ccf5899e8b28ee5079a597d Mon Sep 17 00:00:00 2001 From: Itamar Reis Peixoto Date: Sun, 21 Nov 2010 00:14:38 -0200 Subject: [PATCH] check if freerdp-devel is installed and use it --- configure.ac | 2 ++ freerdp/Makefile.am | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index e4513f9e..88c8b1ee 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,8 @@ then fi fi +AS_IF([test "x$enable_freerdp" = "xyes"], [PKG_CHECK_MODULES(FREERDP, freerdp >= 0.8.1) ], [] ) + # checking for Xlib, Xfixes AC_CHECK_HEADER([X11/Xlib.h], [], [AC_MSG_ERROR([please install libx11-dev or libX11-devel])]) diff --git a/freerdp/Makefile.am b/freerdp/Makefile.am index 3da84da3..a63044f4 100644 --- a/freerdp/Makefile.am +++ b/freerdp/Makefile.am @@ -8,7 +8,7 @@ AM_CFLAGS = \ INCLUDES = \ -I$(top_srcdir)/common \ - -I$(top_srcdir)/../freerdp/include/freerdp + $(FREERDP_CFLAGS) lib_LTLIBRARIES = \ libxrdpfreerdp.la @@ -16,4 +16,5 @@ lib_LTLIBRARIES = \ libxrdpfreerdp_la_SOURCES = xrdp-freerdp.c libxrdpfreerdp_la_LIBADD = \ - $(top_srcdir)/common/libcommon.la + $(top_srcdir)/common/libcommon.la \ + $(FREERDP_LIBS)