diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-10-05 10:15:40 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-10-05 10:36:15 +0200 |
| commit | 62c43b44ffa1208e37aa02502266bd88d3dfd8fd (patch) | |
| tree | 1aef2354ca5098f0413e4fdc077e0559f26cb317 | |
| parent | ceb199f0bf1f54c15cfb61c29c6ad3b58df8807e (diff) | |
LIBWPG_* -> WPG_* to avoid eventual conflict with pkg-config danse
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | libvisio/makefile.mk | 2 | ||||
| -rwxr-xr-x | set_soenv.in | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 47a82562bb0b..39bb3dac62ff 100644 --- a/RepositoryExternal.mk +++ b/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 diff --git a/configure.in b/configure.in index 9605c8f8f76d..f336f4fe29fe 100644 --- a/configure.in +++ b/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 diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk index 31b2ad359d4b..220019ca1aeb 100644 --- a/libvisio/makefile.mk +++ b/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 diff --git a/set_soenv.in b/set_soenv.in index 4700f1d7d2cc..7fe2a3259d47 100755 --- a/set_soenv.in +++ b/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" ); |