Kaydet (Commit) d49543ce authored tarafından Michael Stahl's avatar Michael Stahl

scp2: remove some variable/macro cruft

Change-Id: If07b243e71be7c67d36e3d652c52781ef902e380
üst c4cff5a6
......@@ -350,7 +350,6 @@ export LIBXML_JAR=@LIBXML_JAR@
export LIBXML_LIBS=$(gb_SPACE)@LIBXML_LIBS@
export LIBXSLT_CFLAGS=$(gb_SPACE)@LIBXSLT_CFLAGS@
export LIBXSLT_LIBS=$(gb_SPACE)@LIBXSLT_LIBS@
export LIBXSLT_MAJOR=@LIBXSLT_MAJOR@
export LINK_X64_BINARY=@LINK_X64_BINARY@
@x_Cygwin@ export LS=@WIN_LS@
export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
......
......@@ -7756,7 +7756,6 @@ if test "$with_system_libxml" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBXSLT=
LIBXSLT_MAJOR=1
BUILD_TYPE="$BUILD_TYPE LIBXSLT"
if test "$cross_compiling" = "yes"; then
......@@ -7776,7 +7775,6 @@ AC_SUBST(LIBEXSLT_CFLAGS)
AC_SUBST(LIBEXSLT_LIBS)
AC_SUBST(LIBXSLT_CFLAGS)
AC_SUBST(LIBXSLT_LIBS)
AC_SUBST(LIBXSLT_MAJOR)
AC_SUBST(XSLTPROC)
# ===================================================================
......
......@@ -107,21 +107,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DICU_MAJOR=$(ICU_MAJOR) \
))
ifeq ($(SYSTEM_LIBXSLT),)
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR) \
))
endif
ifeq ($(SYSTEM_REDLAND),)
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DRAPTOR_MAJOR=$(RAPTOR_MAJOR) \
-DRASQAL_MAJOR=$(RASQAL_MAJOR) \
-DREDLAND_MAJOR=$(REDLAND_MAJOR) \
))
endif
ifeq ($(SYSTEM_JFREEREPORT),)
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment