From 0a6a1eb59dadaa0567ee22f242951a7c2cfda7f5 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Fri, 28 Jan 2000 21:41:18 +0000
Subject: [PATCH] Added strip function to if tests.

---
 configure/CONFIG_ADDONS | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS
index ad8c045b6..95306795e 100644
--- a/configure/CONFIG_ADDONS
+++ b/configure/CONFIG_ADDONS
@@ -125,8 +125,7 @@ endif
 ifneq ($(strip $(OBJS_$(OS_CLASS))),)
 OBJS+=$(subst -nil-,,$(OBJS_$(OS_CLASS)))
 else
-ifneq (,$(OBJS_DEFAULT))
-#ifdef OBJS_DEFAULT
+ifneq (,$(strip $(OBJS_DEFAULT)))
 OBJS+=$(OBJS_DEFAULT)
 endif
 endif
@@ -134,8 +133,7 @@ endif
 ifneq ($(strip $(OBJS_IOC_$(OS_CLASS))),)
 OBJS_IOC+=$(subst -nil-,,$(OBJS_IOC_$(OS_CLASS)))
 else
-ifneq (,$(OBJS_IOC_DEFAULT))
-#ifdef OBJS_IOC_DEFAULT
+ifneq (,$(strip $(OBJS_IOC_DEFAULT)))
 OBJS_IOC+=$(OBJS_IOC_DEFAULT)
 endif
 endif
@@ -143,8 +141,7 @@ endif
 ifneq ($(strip $(OBJS_HOST_$(OS_CLASS))),)
 OBJS_HOST+=$(subst -nil-,,$(OBJS_HOST_$(OS_CLASS)))
 else
-ifneq (,$(OBJS_HOST_DEFAULT))
-#ifdef OBJS_HOST_DEFAULT
+ifneq (,$(strip $(OBJS_HOST_DEFAULT)))
 OBJS_HOST+=$(OBJS_HOST_DEFAULT)
 endif
 endif
@@ -152,8 +149,7 @@ endif
 ifneq ($(strip $(LIBRARY_$(OS_CLASS))),)
 LIBRARY+=$(subst -nil-,,$(LIBRARY_$(OS_CLASS)))
 else
-ifneq (,$(LIBRARY_DEFAULT))
-#ifdef LIBRARY_DEFAULT
+ifneq (,$(strip $(LIBRARY_DEFAULT)))
 LIBRARY+=$(LIBRARY_DEFAULT)
 endif
 endif
@@ -161,8 +157,7 @@ endif
 ifneq ($(strip $(LIBRARY_IOC_$(OS_CLASS))),)
 LIBRARY_IOC+=$(subst -nil-,,$(LIBRARY_IOC_$(OS_CLASS)))
 else
-ifneq (,$(LIBRARY_IOC_DEFAULT))
-#ifdef LIBRARY_IOC_DEFAULT
+ifneq (,$(strip $(LIBRARY_IOC_DEFAULT)))
 LIBRARY_IOC+=$(LIBRARY_IOC_DEFAULT)
 endif
 endif
@@ -170,8 +165,7 @@ endif
 ifneq ($(strip $(LIBRARY_HOST_$(OS_CLASS))),)
 LIBRARY_HOST+=$(subst -nil-,,$(LIBRARY_HOST_$(OS_CLASS)))
 else
-ifneq (,$(LIBRARY_HOST_DEFAULT))
-#ifdef LIBRARY_HOST_DEFAULT
+ifneq (,$(strip $(LIBRARY_HOST_DEFAULT)))
 LIBRARY_HOST+=$(LIBRARY_HOST_DEFAULT)
 endif
 endif