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 | |
| 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.
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | src/conv/raw/Makefile.am | 6 | ||||
| -rw-r--r-- | src/conv/svg/Makefile.am | 6 | ||||
| -rw-r--r-- | src/lib/Makefile.am | 4 |
4 files changed, 18 insertions, 15 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 diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am index 12a8cbf..ba089b5 100644 --- a/src/conv/raw/Makefile.am +++ b/src/conv/raw/Makefile.am @@ -1,14 +1,14 @@ bin_PROGRAMS = ppp2raw -AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBPGPLUS_CXXFLAGS) $(DEBUG_CXXFLAGS) +AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS) ppp2raw_DEPENDENCIES = @PPP2RAW_WIN32_RESOURCE@ if STATIC_TOOLS -ppp2raw_LDADD = ../../lib/@PGPLUS_OBJDIR@/libpgplus-@PGPLUS_MAJOR_VERSION@.@PGPLUS_MINOR_VERSION@.a $(LIBPGPLUS_LIBS) @PPP2RAW_WIN32_RESOURCE@ +ppp2raw_LDADD = ../../lib/@PGPLUS_OBJDIR@/libpgplus-@PGPLUS_MAJOR_VERSION@.@PGPLUS_MINOR_VERSION@.a @PPP2RAW_WIN32_RESOURCE@ ppp2raw_LDFLAGS = -all-static else -ppp2raw_LDADD = ../../lib/libpgplus-@PGPLUS_MAJOR_VERSION@.@PGPLUS_MINOR_VERSION@.la $(LIBPGPLUS_LIBS) @PPP2RAW_WIN32_RESOURCE@ +ppp2raw_LDADD = ../../lib/libpgplus-@PGPLUS_MAJOR_VERSION@.@PGPLUS_MINOR_VERSION@.la @PPP2RAW_WIN32_RESOURCE@ endif ppp2raw_SOURCES = \ diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am index b4568cd..02bbec1 100644 --- a/src/conv/svg/Makefile.am +++ b/src/conv/svg/Makefile.am @@ -1,14 +1,14 @@ bin_PROGRAMS = ppp2xhtml -AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBPGPLUS_CXXFLAGS) $(DEBUG_CXXFLAGS) +AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS) ppp2xhtml_DEPENDENCIES = @PPP2XHTML_WIN32_RESOURCE@ if STATIC_TOOLS -ppp2xhtml_LDADD = ../../lib/@PGPLUS_OBJDIR@/libpgplus-@PGPLUS_MAJOR_VERSION@.@PGPLUS_MINOR_VERSION@.a $(LIBPGPLUS_LIBS) @PPP2XHTML_WIN32_RESOURCE@ +ppp2xhtml_LDADD = ../../lib/@PGPLUS_OBJDIR@/libpgplus-@PGPLUS_MAJOR_VERSION@.@PGPLUS_MINOR_VERSION@.a @PPP2XHTML_WIN32_RESOURCE@ ppp2xhtml_LDFLAGS = -all-static else -ppp2xhtml_LDADD = ../../lib/libpgplus-@PGPLUS_MAJOR_VERSION@.@PGPLUS_MINOR_VERSION@.la $(LIBPGPLUS_LIBS) @PPP2XHTML_WIN32_RESOURCE@ +ppp2xhtml_LDADD = ../../lib/libpgplus-@PGPLUS_MAJOR_VERSION@.@PGPLUS_MINOR_VERSION@.la @PPP2XHTML_WIN32_RESOURCE@ endif ppp2xhtml_SOURCES = \ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 3bc3fdf..d12617d 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -11,9 +11,9 @@ libpgplus_@PGPLUS_MAJOR_VERSION@_@PGPLUS_MINOR_VERSION@_include_HEADERS = \ PGPLUSDocument.h \ PGPLUSStringVector.h -AM_CXXFLAGS = $(LIBPGPLUS_CXXFLAGS) $(DEBUG_CXXFLAGS) +AM_CXXFLAGS = $(WPD_CFLAGS) $(WPG_CFLAGS) $(DEBUG_CXXFLAGS) -libpgplus_@PGPLUS_MAJOR_VERSION@_@PGPLUS_MINOR_VERSION@_la_LIBADD = $(LIBPGPLUS_LIBS) @LIBPGPLUS_WIN32_RESOURCE@ +libpgplus_@PGPLUS_MAJOR_VERSION@_@PGPLUS_MINOR_VERSION@_la_LIBADD = $(WPD_LIBS) $(WPG_LIBS) @LIBPGPLUS_WIN32_RESOURCE@ libpgplus_@PGPLUS_MAJOR_VERSION@_@PGPLUS_MINOR_VERSION@_la_DEPENDENCIES = @LIBPGPLUS_WIN32_RESOURCE@ libpgplus_@PGPLUS_MAJOR_VERSION@_@PGPLUS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no_undefined libpgplus_@PGPLUS_MAJOR_VERSION@_@PGPLUS_MINOR_VERSION@_la_SOURCES = \ |