Changeset 4f5e38f for scripts/locker-build

Timestamp:

Jun 19, 2011, 12:07:25 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

d1d68e0

Parents:

b14f8cb

git-author:

David Benjamin <davidben@mit.edu> (04/05/11 12:34:52)

git-committer:

David Benjamin <davidben@mit.edu> (06/19/11 00:07:25)

Message:

Properly discover things when /usr/athena != /usr

On Solaris, by an accident of configure and krb5-config, we manage to
discover libzephyr and libcom_err, but not com_err.h. Thankfully the
latter is not fatal and we relied on C's defaulting everything to int.
And by accident we were searching for libzephyr, and not zephyr.h.

Also use CPPFLAGS instead of CFLAGS to pull in our bundled header files,
otherwise autoconf warns about a discrepancy between the preprocessor
and compiler.

File:

• scripts/locker-build (modified) (1 diff)

scripts/locker-build

@@ -102 +102 @@
     esac
 
-    CFLAGS="-I$BARNOWL/include" \
-        LDFLAGS="-L$BARNOWL/lib $opt_rpath$BARNOWL/lib" \
+    CPPFLAGS="-I$BARNOWL/include -I/usr/athena/include" \
+        LDFLAGS="-L$BARNOWL/lib -L/usr/athena/lib $opt_rpath$BARNOWL/lib" \
         ./configure --exec-prefix="/mit/barnowl/arch/$ATHENA_SYS" \
         --prefix="/mit/barnowl/builds/barnowl-$VERS" --mandir=/mit/barnowl/man \