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

RepositoryExternal.mk

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

configure.in

@@ -4717,15 +4717,15 @@ 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.2 )
+    PKG_CHECK_MODULES( WPG, libwpg-0.2 )
 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)
+AC_SUBST(WPG_CFLAGS)
+AC_SUBST(WPG_LIBS)
 
 dnl ===================================================================
 dnl Check whether freetype2 supports emboldening

libvisio/makefile.mk

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

set_soenv.in

@@ -1907,8 +1907,8 @@ 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( "WPG_CFLAGS",     "@WPG_CFLAGS@",    "e" );
+ToFile( "WPG_LIBS",       "@WPG_LIBS@",      "e" );
 ToFile( "SYSTEM_LIBVISIO",   "@SYSTEM_LIBVISIO@",  "e" );
 ToFile( "LIBVISIO_CFLAGS",   "@LIBVISIO_CFLAGS@",  "e" );
 ToFile( "LIBVISIO_LIBS",     "@LIBVISIO_LIBS@",    "e" );