From 1e074a455ed9c7136868f10bce3e173b22c1564b Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Sat, 10 Dec 2016 23:53:29 +0100
Subject: Remove some not used SCPDEFS

Change-Id: Ib85895c21cef9baeccc468b476cbd8170ee4c9ce
---
 configure.ac                         | 5 -----
 solenv/gbuild/InstallModuleTarget.mk | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6607ffa6dbf7..2cf3ebf543d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2477,8 +2477,6 @@ fi
 if test "$enable_avmedia" = yes; then
     BUILD_TYPE="$BUILD_TYPE AVMEDIA"
     AC_DEFINE(HAVE_FEATURE_AVMEDIA)
-else
-    SCPDEFS="$SCPDEFS -DDISABLE_AVMEDIA"
 fi
 
 # Decide whether to build database connectivity stuff (including
@@ -2539,7 +2537,6 @@ if test "$enable_dynamic_loading" = yes; then
     BUILD_TYPE="$BUILD_TYPE DYNLOADING"
 else
     DISABLE_DYNLOADING='TRUE'
-    SCPDEFS="$SCPDEFS -DDISABLE_DYNLOADING"
 fi
 AC_SUBST(DISABLE_DYNLOADING)
 
@@ -3169,7 +3166,6 @@ fi
 
 if test "$cross_compiling" = "yes"; then
     export CROSS_COMPILING=TRUE
-    SCPDEFS="$SCPDEFS -DCROSS_COMPILING"
 else
     CROSS_COMPILING=
     BUILD_TYPE="$BUILD_TYPE NATIVE"
@@ -7560,7 +7556,6 @@ fi
 ENABLE_LWP=
 if test "$enable_lotuswordpro" = "yes"; then
     ENABLE_LWP="TRUE"
-    SCPDEFS="$SCPDEFS -DDISABLE_LWP"
 fi
 AC_SUBST(ENABLE_LWP)
 
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index 54848b0bf0d8..d24b201550cf 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -68,7 +68,7 @@ $(call gb_Output_announce,$(2),$(true),SPP,2)
 $(call gb_Helper_abbreviate_dirs,\
 	$(gb_ScpPreprocessTarget_COMMAND) \
 		-+ -P \
-		$(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \
+		$(SCPDEFS) $(SCP_DEFS) \
 		$(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \
 	    $(if $(ENABLE_JAVA),-DENABLE_JAVA) \
 		$(SCP_SOURCE) > $(1) \
-- 
cgit