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

LIBWPG_* -> WPG_* to avoid eventual conflict with pkg-config danse

Browse Source
This commit is contained in:
Fridrich Štrba
2011-10-05 10:15:40 +02:00
parent ceb199f0bf
commit 62c43b44ff
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RepositoryExternal.mk
View File

@@ -559,9 +559,9 @@ ifeq ($(SYSTEM_LIBWPG),YES)
define gb_LinkTarget__use_wpg define gb_LinkTarget__use_wpg
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \ $$(INCLUDE) \
$(LIBWPG_CFLAGS) \ $(WPG_CFLAGS) \
) )
$(call gb_LinkTarget_add_libs,$(1),$(LIBWPG_LIBS)) $(call gb_LinkTarget_add_libs,$(1),$(WPG_LIBS))
endef endef

6
configure.in
View File

@@ -4717,15 +4717,15 @@ if test -n "$with_system_libwpg" -o -n "$with_system_libs" && \
test "$with_system_libwpg" != "no"; then test "$with_system_libwpg" != "no"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_LIBWPG=YES SYSTEM_LIBWPG=YES
PKG_CHECK_MODULES( LIBWPG, libwpg-0.2 ) PKG_CHECK_MODULES( WPG, libwpg-0.2 )
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_LIBWPG=NO SYSTEM_LIBWPG=NO
BUILD_TYPE="$BUILD_TYPE LIBWPG" BUILD_TYPE="$BUILD_TYPE LIBWPG"
fi fi
AC_SUBST(SYSTEM_LIBWPG) AC_SUBST(SYSTEM_LIBWPG)
AC_SUBST(LIBWPG_CFLAGS) AC_SUBST(WPG_CFLAGS)
AC_SUBST(LIBWPG_LIBS) AC_SUBST(WPG_LIBS)
dnl =================================================================== dnl ===================================================================
dnl Check whether freetype2 supports emboldening dnl Check whether freetype2 supports emboldening

2
libvisio/makefile.mk
View File

@@ -49,7 +49,7 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
.ENDIF .ENDIF
.IF "$(SYSTEM_LIBWPG)" == "YES" .IF "$(SYSTEM_LIBWPG)" == "YES"
INCPRE+=$(LIBWPG_CFLAGS) INCPRE+=$(WPG_CFLAGS)
.ELSE .ELSE
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
.ENDIF .ENDIF

4
set_soenv.in
View File

@@ -1907,8 +1907,8 @@ ToFile( "SYSTEM_LIBWPS", "@SYSTEM_LIBWPS@", "e" );
ToFile( "LIBWPS_CFLAGS", "@LIBWPS_CFLAGS@", "e" ); ToFile( "LIBWPS_CFLAGS", "@LIBWPS_CFLAGS@", "e" );
ToFile( "LIBWPS_LIBS", "@LIBWPS_LIBS@", "e" ); ToFile( "LIBWPS_LIBS", "@LIBWPS_LIBS@", "e" );
ToFile( "SYSTEM_LIBWPG", "@SYSTEM_LIBWPG@", "e" ); ToFile( "SYSTEM_LIBWPG", "@SYSTEM_LIBWPG@", "e" );
ToFile( "LIBWPG_CFLAGS", "@LIBWPG_CFLAGS@", "e" ); ToFile( "WPG_CFLAGS", "@WPG_CFLAGS@", "e" );
ToFile( "LIBWPG_LIBS", "@LIBWPG_LIBS@", "e" ); ToFile( "WPG_LIBS", "@WPG_LIBS@", "e" );
ToFile( "SYSTEM_LIBVISIO", "@SYSTEM_LIBVISIO@", "e" ); ToFile( "SYSTEM_LIBVISIO", "@SYSTEM_LIBVISIO@", "e" );
ToFile( "LIBVISIO_CFLAGS", "@LIBVISIO_CFLAGS@", "e" ); ToFile( "LIBVISIO_CFLAGS", "@LIBVISIO_CFLAGS@", "e" );
ToFile( "LIBVISIO_LIBS", "@LIBVISIO_LIBS@", "e" ); ToFile( "LIBVISIO_LIBS", "@LIBVISIO_LIBS@", "e" );