diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-06-04 22:35:25 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-06-04 22:35:25 +0000 |
| commit | 9216a70c1eb66d43c571fae2c742259dc8b0b402 (patch) | |
| tree | 5e17a3126d2efa05c8d886d1e1bb381fd99ac205 /src/aclocal.m4 | |
| parent | 8098a4418fab43cb5ec1ba07b103b4f5aea2c3df (diff) | |
| download | krb5-9216a70c1eb66d43c571fae2c742259dc8b0b402.zip krb5-9216a70c1eb66d43c571fae2c742259dc8b0b402.tar.gz krb5-9216a70c1eb66d43c571fae2c742259dc8b0b402.tar.bz2 | |
Change all uses of LIB in UNIX makefiles to LIBBASE, for better Windows
compatibility. (Windows nmake exports make variables into the environment, and
LIB is treated by the Windows linker as a search path for libraries, thus
breaking the linking on Windows of anything needing libraries from the search
path in directories where we build libraries on UNIX.)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16411 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/aclocal.m4')
| -rw-r--r-- | src/aclocal.m4 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 5166402..010f3d8 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1169,8 +1169,8 @@ if test "$enable_static" = no && test "$krb5_force_static" != yes; then LIBLIST= OBJLISTS= else - LIBLIST='lib$(LIB)$(STLIBEXT)' - LIBLINKS='$(TOPLIBD)/lib$(LIB)$(STLIBEXT)' + LIBLIST='lib$(LIBBASE)$(STLIBEXT)' + LIBLINKS='$(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT)' OBJLISTS=OBJS.ST LIBINSTLIST=install-static DEPLIBEXT=$STLIBEXT @@ -1208,15 +1208,15 @@ if test "$enable_shared" = yes; then OBJLISTS= LIBINSTLIST= fi - LIBLIST="$LIBLIST "'lib$(LIB)$(SHLIBEXT)' - LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIB)$(SHLIBEXT) $(TOPLIBD)/lib$(LIB)$(SHLIBVEXT)' + LIBLIST="$LIBLIST "'lib$(LIBBASE)$(SHLIBEXT)' + LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBVEXT)' case "$SHLIBSEXT" in .so.s-nobuild) LIBINSTLIST="$LIBINSTLIST install-shared" ;; *) - LIBLIST="$LIBLIST "'lib$(LIB)$(SHLIBSEXT)' - LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIB)$(SHLIBSEXT)' + LIBLIST="$LIBLIST "'lib$(LIBBASE)$(SHLIBSEXT)' + LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT)' LIBINSTLIST="$LIBINSTLIST install-shlib-soname" ;; esac @@ -1247,8 +1247,8 @@ AC_ARG_ENABLE([profiled], ;; *) AC_MSG_NOTICE([enabling profiled libraries]) - LIBLIST="$LIBLIST "'lib$(LIB)$(PFLIBEXT)' - LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIB)$(PFLIBEXT)' + LIBLIST="$LIBLIST "'lib$(LIBBASE)$(PFLIBEXT)' + LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIBBASE)$(PFLIBEXT)' OBJLISTS="$OBJLISTS OBJS.PF" LIBINSTLIST="$LIBINSTLIST install-profiled" ;; |