diff options
| author | David Tardon <dtardon@redhat.com> | 2013-09-21 16:13:14 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-09-24 16:26:54 +0200 |
| commit | 74f3fd57f6551b8fcb7b774e3aac311ab29a8647 (patch) | |
| tree | f17b79366b162dfb3b20f9a34c95ae284ef0a880 /configure.ac | |
| parent | 1130b59b7518e4533c09818a5129540aadb14d4f (diff) | |
check for libwpd/libwpg in the usual way
... so it is possible to override the check for either one using
WP{D,G}_{CFLAGS,LIBS} variables.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index dbc8668..d841d15 100644 --- a/configure.ac +++ b/configure.ac @@ -33,12 +33,18 @@ AC_PROG_LIBTOOL AC_LIBTOOL_WIN32_DLL PKG_PROG_PKG_CONFIG([0.20]) -# ==================== -# Find additional apps -# ==================== -PKG_CHECK_MODULES([LIBPGPLUS],[ +# =========== +# Find libwpd +# =========== +PKG_CHECK_MODULES([WPD],[ libwpd-0.9 libwpd-stream-0.9 +]) + +# =========== +# Find libwpg +# =========== +PKG_CHECK_MODULES([WPG],[ libwpg-0.2 ]) @@ -146,9 +152,6 @@ AS_IF([test "x$enable_debug" = "xyes"], [ ], [ DEBUG_CXXFLAGS="-DNDEBUG" ]) -LIBPGPLUS_CXXFLAGS="$LIBPGPLUS_CFLAGS" -AC_SUBST(LIBPGPLUS_CXXFLAGS) -AC_SUBST(DEBUG_CXXFLAGS) # ============ # Static tools |