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

LIBVISIO_* -> VISIO_* to avoid eventual conflict with pkg-config danse

Browse Source
This commit is contained in:
Fridrich Štrba
2011-10-05 10:21:08 +02:00
parent e991bba4ef
commit e531e8abae
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

@@ -505,9 +505,9 @@ ifeq ($(SYSTEM_LIBVISIO),YES)
define gb_LinkTarget__use_visio define gb_LinkTarget__use_visio
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \ $$(INCLUDE) \
$(LIBVISIO_CFLAGS) \ $(VISIO_CFLAGS) \
) )
$(call gb_LinkTarget_add_libs,$(1),$(LIBVISIO_LIBS)) $(call gb_LinkTarget_add_libs,$(1),$(VISIO_LIBS))
endef endef

6
configure.in
View File

@@ -4613,15 +4613,15 @@ AC_MSG_CHECKING([which libvisio to use])
if test -n "$with_system_libvisio" -a "$with_system_libvisio" = "yes"; then if test -n "$with_system_libvisio" -a "$with_system_libvisio" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_LIBVISIO=YES SYSTEM_LIBVISIO=YES
PKG_CHECK_MODULES( LIBVISIO, libvisio-0.0 ) PKG_CHECK_MODULES( VISIO, libvisio-0.0 )
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_LIBVISIO=NO SYSTEM_LIBVISIO=NO
BUILD_TYPE="$BUILD_TYPE LIBVISIO" BUILD_TYPE="$BUILD_TYPE LIBVISIO"
fi fi
AC_SUBST(SYSTEM_LIBVISIO) AC_SUBST(SYSTEM_LIBVISIO)
AC_SUBST(LIBVISIO_CFLAGS) AC_SUBST(VISIO_CFLAGS)
AC_SUBST(LIBVISIO_LIBS) AC_SUBST(VISIO_LIBS)
dnl =================================================================== dnl ===================================================================
dnl Check for system libcmis dnl Check for system libcmis

4
set_soenv.in
View File

@@ -1910,8 +1910,8 @@ 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" );
ToFile( "SYSTEM_LIBVISIO", "@SYSTEM_LIBVISIO@", "e" ); ToFile( "SYSTEM_LIBVISIO", "@SYSTEM_LIBVISIO@", "e" );
ToFile( "LIBVISIO_CFLAGS", "@LIBVISIO_CFLAGS@", "e" ); ToFile( "VISIO_CFLAGS", "@VISIO_CFLAGS@", "e" );
ToFile( "LIBVISIO_LIBS", "@LIBVISIO_LIBS@", "e" ); ToFile( "VISIO_LIBS", "@VISIO_LIBS@", "e" );
ToFile( "SYSTEM_LIBCMIS", "@SYSTEM_LIBCMIS@", "e" ); ToFile( "SYSTEM_LIBCMIS", "@SYSTEM_LIBCMIS@", "e" );
ToFile( "LIBCMIS_CFLAGS", "@LIBCMIS_CFLAGS@", "e" ); ToFile( "LIBCMIS_CFLAGS", "@LIBCMIS_CFLAGS@", "e" );
ToFile( "LIBCMIS_LIBS", "@LIBCMIS_LIBS@", "e" ); ToFile( "LIBCMIS_LIBS", "@LIBCMIS_LIBS@", "e" );