diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-14 11:01:32 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-14 11:01:32 +0200 |
| commit | b3d65a7d1cf2eb66105456d4c2c9fbebeea9e1b4 (patch) | |
| tree | fa1d1723e14d670786525725fa549d0683ab6209 | |
| parent | 929ee2f488c8ef6e7d144f00f4da486f9ec28f94 (diff) | |
wpsimport-config_office.diff: WPS import filter - configure part.
| -rw-r--r-- | configure.in | 21 | ||||
| -rw-r--r-- | set_soenv.in | 3 |
2 files changed, 24 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 2acf2ab6013e..bcf96e1e8b4c 100644 --- a/configure.in +++ b/configure.in @@ -343,6 +343,9 @@ AC_ARG_WITH(system-expat, AC_ARG_WITH(system-libwpd, [ --with-system-libwpd Use libwpd already on system ],,) +AC_ARG_WITH(system-libwps, +[ --with-system-libwps Use libwps already on system +],,) AC_ARG_WITH(system-libxml, [ --with-system-libxml Use libxml already on system ],,) @@ -3691,6 +3694,24 @@ AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_LIBS) dnl =================================================================== +dnl Check for system libwps +dnl =================================================================== +AC_MSG_CHECKING([which libwps to use]) +if test -n "$with_system_libwps" -o -n "$with_system_libs" && \ + test "$with_system_libwps" != "no"; then + AC_MSG_RESULT([external]) + SYSTEM_LIBWPS=YES + PKG_CHECK_MODULES( LIBWPS, libwps-0.1 ) +else + AC_MSG_RESULT([internal]) + SYSTEM_LIBWPS=NO + BUILD_TYPE="$BUILD_TYPE LIBWPS" +fi +AC_SUBST(SYSTEM_LIBWPS) +AC_SUBST(LIBWPS_CFLAGS) +AC_SUBST(LIBWPS_LIBS) + +dnl =================================================================== dnl Check whether freetype2 supports emboldening dnl =================================================================== if test "$test_freetype" = "yes"; then diff --git a/set_soenv.in b/set_soenv.in index 68ff7ca88f70..75f8b6959154 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1860,6 +1860,9 @@ ToFile( "XRANDR_DLOPEN", "@XRANDR_DLOPEN@", "e" ); ToFile( "SYSTEM_LIBWPD", "@SYSTEM_LIBWPD@", "e" ); ToFile( "LIBWPD_CFLAGS", "@LIBWPD_CFLAGS@", "e" ); ToFile( "LIBWPD_LIBS", "@LIBWPD_LIBS@", "e" ); +ToFile( "SYSTEM_LIBWPS", "@SYSTEM_LIBWPS@", "e" ); +ToFile( "LIBWPS_CFLAGS", "@LIBWPS_CFLAGS@", "e" ); +ToFile( "LIBWPS_LIBS", "@LIBWPS_LIBS@", "e" ); ToFile( "SYSTEM_CPPUNIT", "@SYSTEM_CPPUNIT@", "e" ); ToFile( "CPPUNIT_CFLAGS", "@CPPUNIT_CFLAGS@", "e" ); ToFile( "CPPUNIT_LIBS", "@CPPUNIT_LIBS@", "e" ); |