diff options
author | Eric Sandeen <sandeen@sgi.com> | 2002-05-14 15:31:38 +0000 |
---|---|---|
committer | Eric Sandeen <sandeen@sgi.com> | 2002-05-14 15:31:38 +0000 |
commit | 068da669912034e3904cb9441c0ea4661fcb577f (patch) | |
tree | da0caf361bd093c0e0dd1425c807d73989ad176b | |
parent | 715253f056ad142dafa8f3bc2b5114e9f6564baf (diff) | |
download | acl-068da669912034e3904cb9441c0ea4661fcb577f.tar.gz |
Look for libs within source tree first
(will use system libs if found)
-rw-r--r-- | configure.in | 1 | ||||
-rw-r--r-- | include/buildmacros | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 079f29a..b8ccc3a 100644 --- a/configure.in +++ b/configure.in @@ -185,6 +185,7 @@ AC_CHECK_LIB(attr, getxattr,, [ exit 1 ]) libattr="-lattr" +test -f `pwd`/../attr/libattr/libattr.la && libattr="`pwd`/../attr/libattr/libattr.la" test -f /usr/lib/libattr.la && libattr="/usr/lib/libattr.la" AC_SUBST(libattr) diff --git a/include/buildmacros b/include/buildmacros index 26f90f4..d360443 100644 --- a/include/buildmacros +++ b/include/buildmacros @@ -56,7 +56,7 @@ SHELL = /bin/sh IMAGES_DIR = $(TOPDIR)/all-images DIST_DIR = $(TOPDIR)/dist -CCF = $(CC) $(CFLAGS) +CCF = $(CC) $(CFLAGS) $(CPPFLAGS) MAKEF = $(MAKE) $(MAKEOPTS) CXXF = $(CXX) $(CXXFLAGS) LDF = $(LD) $(LDFLAGS) |