diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-10-05 10:21:08 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-10-05 10:36:16 +0200 |
| commit | e531e8abae9fef4bd3602b734d265c95e8146073 (patch) | |
| tree | f412516abd4b5f2b612ec46ab6b4d4287638928d | |
| parent | e991bba4ef49f5d2d07b992912ff23ef3a071bc1 (diff) | |
LIBVISIO_* -> VISIO_* to avoid eventual conflict with pkg-config danse
| -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 bc9c058a5ef7..db8138cf9ebb 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -505,9 +505,9 @@ ifeq ($(SYSTEM_LIBVISIO),YES) define gb_LinkTarget__use_visio $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $(LIBVISIO_CFLAGS) \ + $(VISIO_CFLAGS) \ ) -$(call gb_LinkTarget_add_libs,$(1),$(LIBVISIO_LIBS)) +$(call gb_LinkTarget_add_libs,$(1),$(VISIO_LIBS)) endef diff --git a/configure.in b/configure.in index 09a5fadea825..808840903b85 100644 --- a/configure.in +++ b/configure.in @@ -4613,15 +4613,15 @@ AC_MSG_CHECKING([which libvisio to use]) if test -n "$with_system_libvisio" -a "$with_system_libvisio" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_LIBVISIO=YES - PKG_CHECK_MODULES( LIBVISIO, libvisio-0.0 ) + PKG_CHECK_MODULES( VISIO, libvisio-0.0 ) else AC_MSG_RESULT([internal]) SYSTEM_LIBVISIO=NO BUILD_TYPE="$BUILD_TYPE LIBVISIO" fi AC_SUBST(SYSTEM_LIBVISIO) -AC_SUBST(LIBVISIO_CFLAGS) -AC_SUBST(LIBVISIO_LIBS) +AC_SUBST(VISIO_CFLAGS) +AC_SUBST(VISIO_LIBS) dnl =================================================================== dnl Check for system libcmis diff --git a/set_soenv.in b/set_soenv.in index 13629212ae00..1f497384f7c8 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1910,8 +1910,8 @@ ToFile( "SYSTEM_LIBWPG", "@SYSTEM_LIBWPG@", "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" ); +ToFile( "VISIO_CFLAGS", "@VISIO_CFLAGS@", "e" ); +ToFile( "VISIO_LIBS", "@VISIO_LIBS@", "e" ); ToFile( "SYSTEM_LIBCMIS", "@SYSTEM_LIBCMIS@", "e" ); ToFile( "LIBCMIS_CFLAGS", "@LIBCMIS_CFLAGS@", "e" ); ToFile( "LIBCMIS_LIBS", "@LIBCMIS_LIBS@", "e" ); |