summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2012-11-05 10:29:29 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2012-11-05 10:29:29 +0100
commit34f5e9767029ea9161eb8f113ea20c958c9b96c4 (patch)
tree241348e028ef3c8222a8d4a23913055b1a4e040e /configure.ac
parentd0b41f0f262656045c0de07892f989ea14d744fd (diff)
Like in libcdr, detect each pkg-config dependency separately
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac12
1 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 6925087..4e4017e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,10 +55,16 @@ AC_SUBST(GPERF)
# ====================
# Find additional apps
# ====================
-PKG_CHECK_MODULES([LIBVISIO],[
+PKG_CHECK_MODULES([WPD],[
libwpd-0.9
libwpd-stream-0.9
+])
+
+PKG_CHECK_MODULES([WPG],[
libwpg-0.2
+])
+
+PKG_CHECK_MODULES([LIBXML],[
libxml-2.0
])
@@ -216,8 +222,10 @@ AS_IF([test "x$native_win32" = "xyes"], [
CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wshadow -pedantic"
])
])
-LIBVISIO_CXXFLAGS="$LIBVISIO_CFLAGS"
+LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS}"
+LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS}"
AC_SUBST(LIBVISIO_CXXFLAGS)
+AC_SUBST(LIBVISIO_LIBS)
# ============
# Debug switch