diff options
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rwxr-xr-x | set_soenv.in | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 39bb3dac62ff..bc9c058a5ef7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -586,9 +586,9 @@ ifeq ($(SYSTEM_LIBWPS),YES) define gb_LinkTarget__use_wps $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $(LIBWPS_CFLAGS) \ + $(WPS_CFLAGS) \ ) -$(call gb_LinkTarget_add_libs,$(1),$(LIBWPS_LIBS)) +$(call gb_LinkTarget_add_libs,$(1),$(WPS_LIBS)) endef diff --git a/configure.in b/configure.in index f336f4fe29fe..09a5fadea825 100644 --- a/configure.in +++ b/configure.in @@ -4699,15 +4699,15 @@ 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.2 ) + PKG_CHECK_MODULES( WPS, libwps-0.2 ) 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) +AC_SUBST(WPS_CFLAGS) +AC_SUBST(WPS_LIBS) dnl =================================================================== dnl Check for system libwpg diff --git a/set_soenv.in b/set_soenv.in index 7fe2a3259d47..13629212ae00 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1904,8 +1904,8 @@ ToFile( "SYSTEM_LIBWPD", "@SYSTEM_LIBWPD@", "e" ); ToFile( "WPD_CFLAGS", "@WPD_CFLAGS@", "e" ); ToFile( "WPD_LIBS", "@WPD_LIBS@", "e" ); ToFile( "SYSTEM_LIBWPS", "@SYSTEM_LIBWPS@", "e" ); -ToFile( "LIBWPS_CFLAGS", "@LIBWPS_CFLAGS@", "e" ); -ToFile( "LIBWPS_LIBS", "@LIBWPS_LIBS@", "e" ); +ToFile( "WPS_CFLAGS", "@WPS_CFLAGS@", "e" ); +ToFile( "WPS_LIBS", "@WPS_LIBS@", "e" ); ToFile( "SYSTEM_LIBWPG", "@SYSTEM_LIBWPG@", "e" ); ToFile( "WPG_CFLAGS", "@WPG_CFLAGS@", "e" ); ToFile( "WPG_LIBS", "@WPG_LIBS@", "e" ); |