[Libreoffice-commits] .: 3 commits - configure.in libvisio/makefile.mk RepositoryExternal.mk set_soenv.in
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Oct 5 01:36:24 PDT 2011
RepositoryExternal.mk | 12 ++++++------
configure.in | 18 +++++++++---------
libvisio/makefile.mk | 2 +-
set_soenv.in | 12 ++++++------
4 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit e531e8abae9fef4bd3602b734d265c95e8146073
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Oct 5 10:21:08 2011 +0200
LIBVISIO_* -> VISIO_* to avoid eventual conflict with pkg-config danse
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index bc9c058..db8138c 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 09a5fad..8088409 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 1362921..1f49738 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" );
commit e991bba4ef49f5d2d07b992912ff23ef3a071bc1
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Oct 5 10:18:53 2011 +0200
LIBWPS_* -> WPS_* to avoid eventual conflict with pkg-config danse
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 39bb3da..bc9c058 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -586,9 +586,9 @@ ifeq ($(SYSTEM_LIBWPS),YES)
define gb_LinkTarget__use_wps
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
- $(LIBWPS_CFLAGS) \
+ $(WPS_CFLAGS) \
)
-$(call gb_LinkTarget_add_libs,$(1),$(LIBWPS_LIBS))
+$(call gb_LinkTarget_add_libs,$(1),$(WPS_LIBS))
endef
diff --git a/configure.in b/configure.in
index f336f4f..09a5fad 100644
--- a/configure.in
+++ b/configure.in
@@ -4699,15 +4699,15 @@ if test -n "$with_system_libwps" -o -n "$with_system_libs" && \
test "$with_system_libwps" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_LIBWPS=YES
- PKG_CHECK_MODULES( LIBWPS, libwps-0.2 )
+ PKG_CHECK_MODULES( WPS, libwps-0.2 )
else
AC_MSG_RESULT([internal])
SYSTEM_LIBWPS=NO
BUILD_TYPE="$BUILD_TYPE LIBWPS"
fi
AC_SUBST(SYSTEM_LIBWPS)
-AC_SUBST(LIBWPS_CFLAGS)
-AC_SUBST(LIBWPS_LIBS)
+AC_SUBST(WPS_CFLAGS)
+AC_SUBST(WPS_LIBS)
dnl ===================================================================
dnl Check for system libwpg
diff --git a/set_soenv.in b/set_soenv.in
index 7fe2a32..1362921 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1904,8 +1904,8 @@ ToFile( "SYSTEM_LIBWPD", "@SYSTEM_LIBWPD@", "e" );
ToFile( "WPD_CFLAGS", "@WPD_CFLAGS@", "e" );
ToFile( "WPD_LIBS", "@WPD_LIBS@", "e" );
ToFile( "SYSTEM_LIBWPS", "@SYSTEM_LIBWPS@", "e" );
-ToFile( "LIBWPS_CFLAGS", "@LIBWPS_CFLAGS@", "e" );
-ToFile( "LIBWPS_LIBS", "@LIBWPS_LIBS@", "e" );
+ToFile( "WPS_CFLAGS", "@WPS_CFLAGS@", "e" );
+ToFile( "WPS_LIBS", "@WPS_LIBS@", "e" );
ToFile( "SYSTEM_LIBWPG", "@SYSTEM_LIBWPG@", "e" );
ToFile( "WPG_CFLAGS", "@WPG_CFLAGS@", "e" );
ToFile( "WPG_LIBS", "@WPG_LIBS@", "e" );
commit 62c43b44ffa1208e37aa02502266bd88d3dfd8fd
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Oct 5 10:15:40 2011 +0200
LIBWPG_* -> WPG_* to avoid eventual conflict with pkg-config danse
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 47a8256..39bb3da 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 9605c8f..f336f4f 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 31b2ad3..220019c 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 4700f1d..7fe2a32 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" );
More information about the Libreoffice-commits
mailing list