diff options
| -rw-r--r-- | configure.in | 21 | ||||
| -rw-r--r-- | scp2/source/graphicfilter/file_graphicfilter.scp | 1 | ||||
| -rw-r--r-- | scp2/source/graphicfilter/module_graphicfilter.scp | 2 | ||||
| -rw-r--r-- | set_soenv.in | 3 |
4 files changed, 26 insertions, 1 deletions
diff --git a/configure.in b/configure.in index bcf96e1e8b4c..29d808d18059 100644 --- a/configure.in +++ b/configure.in @@ -346,6 +346,9 @@ AC_ARG_WITH(system-libwpd, AC_ARG_WITH(system-libwps, [ --with-system-libwps Use libwps already on system ],,) +AC_ARG_WITH(system-libwpg, +[ --with-system-libwpg Use libwpg already on system +],,) AC_ARG_WITH(system-libxml, [ --with-system-libxml Use libxml already on system ],,) @@ -3712,6 +3715,24 @@ AC_SUBST(LIBWPS_CFLAGS) AC_SUBST(LIBWPS_LIBS) dnl =================================================================== +dnl Check for system libwpg +dnl =================================================================== +AC_MSG_CHECKING([which libwpg to use]) +if test -n "$with_system_libwpg" -o -n "$with_system_libs" && \ + test "$with_system_libwpg" != "no"; then + AC_MSG_RESULT([external]) + SYSTEM_LIBWPG=YES + PKG_CHECK_MODULES( LIBWPG, libwpg-0.1 ) +else + AC_MSG_RESULT([internal]) + SYSTEM_LIBWPG=NO + BUILD_TYPE="$BUILD_TYPE LIBWPG" +fi +AC_SUBST(SYSTEM_LIBWPG) +AC_SUBST(LIBWPG_CFLAGS) +AC_SUBST(LIBWPG_LIBS) + +dnl =================================================================== dnl Check whether freetype2 supports emboldening dnl =================================================================== if test "$test_freetype" = "yes"; then diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp index 2cd0f53f9e56..4ba30a6849a7 100644 --- a/scp2/source/graphicfilter/file_graphicfilter.scp +++ b/scp2/source/graphicfilter/file_graphicfilter.scp @@ -38,3 +38,4 @@ STD_UNO_LIB_FILE( gid_File_Lib_Flash, flash ) STD_UNO_LIB_FILE( gid_File_Lib_Svg, svgfilter ) +STD_UNO_LIB_FILE_PATCH( gid_File_Lib_WPGImport, wpgimport ) diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index d5d99969fd64..5b6dffb7d14a 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -33,6 +33,6 @@ Module gid_Module_Optional_Grfflt Sortkey = "600"; ParentID = gid_Module_Optional; Default = YES; - Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, + Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport, gid_File_Share_Registry_Graphicfilter_Xcd); End diff --git a/set_soenv.in b/set_soenv.in index 75f8b6959154..977f93e7f06f 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1863,6 +1863,9 @@ 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_LIBWPG", "@SYSTEM_LIBWPG@", "e" ); +ToFile( "LIBWPG_CFLAGS", "@LIBWPG_CFLAGS@", "e" ); +ToFile( "LIBWPG_LIBS", "@LIBWPG_LIBS@", "e" ); ToFile( "SYSTEM_CPPUNIT", "@SYSTEM_CPPUNIT@", "e" ); ToFile( "CPPUNIT_CFLAGS", "@CPPUNIT_CFLAGS@", "e" ); ToFile( "CPPUNIT_LIBS", "@CPPUNIT_LIBS@", "e" ); |