From 277bbca5167f7f5105569256becc0470cbe7c7f2 Mon Sep 17 00:00:00 2001
From: Guenter Knauf <fuankg@apache.org>
Date: Sun, 6 Mar 2011 23:36:14 +0000
Subject: NetWare build overhaul in order to compile on Linux.

Fix for crappy linker which cant deal with absolute unix
paths for import files.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1078631 13f79535-47bb-0310-9956-ffa450edef68
---
 dbd/NWGNUdbdfreetds | 4 +---
 dbd/NWGNUdbdmysql   | 4 +---
 dbd/NWGNUdbdpgsql   | 6 +++++-
 dbd/NWGNUdbdsqli2   | 4 +---
 dbd/NWGNUdbdsqli3   | 4 +---
 5 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'dbd')

diff --git a/dbd/NWGNUdbdfreetds b/dbd/NWGNUdbdfreetds
index bc631ee83..393e380c5 100644
--- a/dbd/NWGNUdbdfreetds
+++ b/dbd/NWGNUdbdfreetds
@@ -60,11 +60,9 @@ XDEFINES	+= \
 XLFLAGS		+= \
 			$(EOLIST)
 
-ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(FREETDSSDK)/lib \
 			$(EOLIST)
-endif
 
 #
 # These values will be appended to the correct variables based on the value of
@@ -244,7 +242,7 @@ FILES_nlm_Ximports = \
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(FREETDS_IMP) \
+	@$(notdir $(FREETDS_IMP)) \
 	$(EOLIST)
 endif
 
diff --git a/dbd/NWGNUdbdmysql b/dbd/NWGNUdbdmysql
index 6f63946d7..72bb414e2 100644
--- a/dbd/NWGNUdbdmysql
+++ b/dbd/NWGNUdbdmysql
@@ -64,11 +64,9 @@ XDEFINES	+= \
 XLFLAGS		+= \
 			$(EOLIST)
 
-ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(MYSQLSDK)/lib \
 			$(EOLIST)
-endif
 
 #
 # These values will be appended to the correct variables based on the value of
@@ -248,7 +246,7 @@ FILES_nlm_Ximports = \
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(MYSQL_IMP) \
+	@$(notdir $(MYSQL_IMP)) \
 	$(EOLIST)
 endif
 
diff --git a/dbd/NWGNUdbdpgsql b/dbd/NWGNUdbdpgsql
index 4862237c0..f6848fa96 100644
--- a/dbd/NWGNUdbdpgsql
+++ b/dbd/NWGNUdbdpgsql
@@ -65,6 +65,10 @@ ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(PGSQLSDK)/lib \
 			$(EOLIST)
+else
+XLFLAGS		+= \
+			-l $(PGSQLSDK)/imp \
+			$(EOLIST)
 endif
 
 #
@@ -245,7 +249,7 @@ FILES_nlm_Ximports = \
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(PGSQL_IMP) \
+	@$(notdir $(PGSQL_IMP)) \
 	$(EOLIST)
 endif
 
diff --git a/dbd/NWGNUdbdsqli2 b/dbd/NWGNUdbdsqli2
index 584f60ab5..c1f9cd1fa 100644
--- a/dbd/NWGNUdbdsqli2
+++ b/dbd/NWGNUdbdsqli2
@@ -60,11 +60,9 @@ XDEFINES	+= \
 XLFLAGS		+= \
 			$(EOLIST)
 
-ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(SQLITE2SDK) \
 			$(EOLIST)
-endif
 
 #
 # These values will be appended to the correct variables based on the value of
@@ -244,7 +242,7 @@ FILES_nlm_Ximports = \
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(SQLITE2_IMP) \
+	@$(notdir $(SQLITE2_IMP)) \
 	$(EOLIST)
 endif
 
diff --git a/dbd/NWGNUdbdsqli3 b/dbd/NWGNUdbdsqli3
index d5468bce3..ed52a2486 100644
--- a/dbd/NWGNUdbdsqli3
+++ b/dbd/NWGNUdbdsqli3
@@ -60,11 +60,9 @@ XDEFINES	+= \
 XLFLAGS		+= \
 			$(EOLIST)
 
-ifdef LINK_STATIC
 XLFLAGS		+= \
 			-l $(SQLITE3SDK) \
 			$(EOLIST)
-endif
 
 #
 # These values will be appended to the correct variables based on the value of
@@ -246,7 +244,7 @@ FILES_nlm_Ximports = \
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(SQLITE3_IMP) \
+	@$(notdir $(SQLITE3_IMP)) \
 	$(EOLIST)
 endif
 
-- 
cgit v1.2.1