Do not include /usr/include and /usr/lib in the header and library search

paths as gcc 3.2 doesn't like this.

Submitted by:	Bjoern Fernhomberg <lists@fernhomberg.de>

diff --git a/macros/db3-check.m4 b/macros/db3-check.m4
index a85941ea81480edc9b106b729fecc88e79abe71c..2a63d3435f6717b3db7f3b832845bbc85b333e97 100644 (file)
--- a/macros/db3-check.m4
+++ b/macros/db3-check.m4
@@ -1,4 +1,4 @@
-dnl $Id: db3-check.m4,v 1.9 2003-02-16 02:13:05 jmarcus Exp $
+dnl $Id: db3-check.m4,v 1.10 2003-02-23 16:09:28 jmarcus Exp $
 dnl Autoconf macro to check for the Berkeley DB library
 
 AC_DEFUN([AC_PATH_BDB], [
@@ -24,8 +24,13 @@ AC_DEFUN([AC_PATH_BDB], [
                        LDFLAGS="-L$bdblibdir $LDFLAGS"
                        AC_CHECK_LIB(db, main, [
                                bdbfound=yes
-                               BDB_CFLAGS="-I$bdbdir"
-                               BDB_LIBS="-L$bdblibdir -ldb"
+                               if test "$bdbdir" != "/usr/include"; then
+                                   BDB_CFLAGS="-I$bdbdir"
+                               fi
+                               if test "$bdblibdir" != "/usr/lib"; then
+                                   BDB_LIBS="-L$bdblibdir"
+                               fi
+                               BDB_LIBS="$DBD_LIBS -ldb"
                                BDB_BIN=$bdbbindir
                                BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
                        ])

diff --git a/macros/srvloc.m4 b/macros/srvloc.m4
index d56f33f4ef847cb10f814d086f6b87b682c15505..d3aa8ac797c1b2e37bcb709db3fbfbbdbf879c82 100644 (file)
--- a/macros/srvloc.m4
+++ b/macros/srvloc.m4
@@ -1,6 +1,6 @@
 dnl Check for optional server location protocol support (used by MacOS X)
 
-dnl $Id: srvloc.m4,v 1.7 2003-01-29 00:16:31 srittau Exp $
+dnl $Id: srvloc.m4,v 1.8 2003-02-23 16:09:28 jmarcus Exp $
 
 AC_DEFUN([NETATALK_SRVLOC], [
 
@@ -32,8 +32,11 @@ AC_DEFUN([NETATALK_SRVLOC], [
                        ]
                )
                AC_CHECK_LIB(slp, SLPOpen, [
-                       SLP_LIBS="-L$srvloc/lib -lslp"
-                       SLP_CFLAGS="-I$srvloc/include"
+                       if test "$srvloc" != "/usr"; then
+                           SLP_LIBS="-L$srvloc/lib"
+                           SLP_CFLAGS="-I$srvloc/include"
+                       fi
+                       SLP_LIBS="$SLP_LIBS -lslp"
                ], AC_MSG_ERROR([SLP installation not found]))
 
                AC_DEFINE(USE_SRVLOC, 1, [Define to enable SLP support])