[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: libdb3 in kernel



I have included a small patch to ac20 that *should* work fine regardless of what db you have installed.

-Nathan

On Wed, Mar 21, 2001 at 12:11:18AM -0600, Taral wrote:
> Okay, so I play with 2.4.2-ac20 and LO! It breaks. aicasm still needs
> libdb3, but tries to link with '-ldb' -- nonexistent on my system. I've
> hacked around this, but it should be fixed, no?
> 
> -- 
> Taral <taral@taral.net>
> Please use PGP/GPG to send me mail.
> "Never ascribe to malice what can as easily be put down to stupidity."


diff -urN 2.4.2-ac20.orig/drivers/scsi/aic7xxx/aicasm/Makefile 2.4.2-ac20/drivers/scsi/aic7xxx/aicasm/Makefile
--- 2.4.2-ac20.orig/drivers/scsi/aic7xxx/aicasm/Makefile	Tue Mar 13 11:28:11 2001
+++ 2.4.2-ac20/drivers/scsi/aic7xxx/aicasm/Makefile	Tue Mar 13 14:57:46 2001
@@ -22,19 +22,21 @@
 .SUFFIXES= .l .y .c
 
 
-$(PROG): $(SRCS) aicdb.h
-	$(HOSTCC) $(AICASM_CFLAGS) $(SRCS) -o $(PROG)
-
-aicdb.h:
+$(PROG): $(SRCS) 
 	if [ -e "/usr/include/db3/db_185.h" ]; then		\
 		echo "#include <db3/db_185.h>" > aicdb.h;	\
-	elif [ -e "/usr/include/db/db_185.h" ]; then		\
-		echo "#include <db/db_185.h>" >aicdb.h	;	\
 	elif [ -e "/usr/include/db_185.h" ]; then		\
-		echo "#include <db_185.h>" >aicdb.h ;		\
+		echo "#include <db_185.h>" > aicdb.h;		\
+	elif [ -e "/usr/include/db/db_185.h" ]; then		\
+		echo "#include <db/db_185.h>" > aicdb.h;	\
+	elif [ -e "/usr/include/db2/db_185.h" ]; then		\
+		echo "#include <db2/db_185.h>" > aicdb.h;	\
+	elif [ -e "/usr/include/db1/db_185.h" ]; then		\
+		echo "#include <db1/db_185.h>" > aicdb.h;	\
 	else							\
-		echo "*** Install db3 development libraries";	\
+		echo "*** Install db development libraries";	\
 	fi
+	$(HOSTCC) $(AICASM_CFLAGS) $(SRCS) -o $(PROG)
 
 clean:
-	rm -f $(CLEANFILES) $(PROG)
+	rm -f $(CLEANFILES) $(PROG) aicdb.h

Reply to: