mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LIBWPS_* -> WPS_* to avoid eventual conflict with pkg-config danse

Browse Source
This commit is contained in:
Fridrich Štrba
2011-10-05 10:18:53 +02:00
parent 62c43b44ff
commit e991bba4ef
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RepositoryExternal.mk
View File

@@ -586,9 +586,9 @@ ifeq ($(SYSTEM_LIBWPS),YES)
define gb_LinkTarget__use_wps define gb_LinkTarget__use_wps
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \ $$(INCLUDE) \
$(LIBWPS_CFLAGS) \ $(WPS_CFLAGS) \
) )
$(call gb_LinkTarget_add_libs,$(1),$(LIBWPS_LIBS)) $(call gb_LinkTarget_add_libs,$(1),$(WPS_LIBS))
endef endef

6
configure.in
View File

@@ -4699,15 +4699,15 @@ if test -n "$with_system_libwps" -o -n "$with_system_libs" && \
test "$with_system_libwps" != "no"; then test "$with_system_libwps" != "no"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_LIBWPS=YES SYSTEM_LIBWPS=YES
PKG_CHECK_MODULES( LIBWPS, libwps-0.2 ) PKG_CHECK_MODULES( WPS, libwps-0.2 )
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_LIBWPS=NO SYSTEM_LIBWPS=NO
BUILD_TYPE="$BUILD_TYPE LIBWPS" BUILD_TYPE="$BUILD_TYPE LIBWPS"
fi fi
AC_SUBST(SYSTEM_LIBWPS) AC_SUBST(SYSTEM_LIBWPS)
AC_SUBST(LIBWPS_CFLAGS) AC_SUBST(WPS_CFLAGS)
AC_SUBST(LIBWPS_LIBS) AC_SUBST(WPS_LIBS)
dnl =================================================================== dnl ===================================================================
dnl Check for system libwpg dnl Check for system libwpg

4
set_soenv.in
View File

@@ -1904,8 +1904,8 @@ ToFile( "SYSTEM_LIBWPD", "@SYSTEM_LIBWPD@", "e" );
ToFile( "WPD_CFLAGS", "@WPD_CFLAGS@", "e" ); ToFile( "WPD_CFLAGS", "@WPD_CFLAGS@", "e" );
ToFile( "WPD_LIBS", "@WPD_LIBS@", "e" ); ToFile( "WPD_LIBS", "@WPD_LIBS@", "e" );
ToFile( "SYSTEM_LIBWPS", "@SYSTEM_LIBWPS@", "e" ); ToFile( "SYSTEM_LIBWPS", "@SYSTEM_LIBWPS@", "e" );
ToFile( "LIBWPS_CFLAGS", "@LIBWPS_CFLAGS@", "e" ); ToFile( "WPS_CFLAGS", "@WPS_CFLAGS@", "e" );
ToFile( "LIBWPS_LIBS", "@LIBWPS_LIBS@", "e" ); ToFile( "WPS_LIBS", "@WPS_LIBS@", "e" );
ToFile( "SYSTEM_LIBWPG", "@SYSTEM_LIBWPG@", "e" ); ToFile( "SYSTEM_LIBWPG", "@SYSTEM_LIBWPG@", "e" );
ToFile( "WPG_CFLAGS", "@WPG_CFLAGS@", "e" ); ToFile( "WPG_CFLAGS", "@WPG_CFLAGS@", "e" );
ToFile( "WPG_LIBS", "@WPG_LIBS@", "e" ); ToFile( "WPG_LIBS", "@WPG_LIBS@", "e" );