diff options
| author | Marc Horowitz <marc@mit.edu> | 1998-10-30 02:56:35 +0000 |
|---|---|---|
| committer | Marc Horowitz <marc@mit.edu> | 1998-10-30 02:56:35 +0000 |
| commit | 1440ab035ba04550ddbbfbff1ee9b5571e3d95db (patch) | |
| tree | 9d5e8d2e151a930e044c7d0f7c64053d244577a0 /src/aclocal.m4 | |
| parent | 61ddbf948ba6ee70c1bc049268c3dfa73bc9983e (diff) | |
| download | krb5-1440ab035ba04550ddbbfbff1ee9b5571e3d95db.tar.gz krb5-1440ab035ba04550ddbbfbff1ee9b5571e3d95db.tar.xz krb5-1440ab035ba04550ddbbfbff1ee9b5571e3d95db.zip | |
pull up 3des implementation from the marc-3des branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11001 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/aclocal.m4')
| -rw-r--r-- | src/aclocal.m4 | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/aclocal.m4 b/src/aclocal.m4 index af2d8a923..1bfd92606 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -868,8 +868,8 @@ if test "$enableval" = no && test "$krb5_force_static" != yes; then LIBLIST= OBJLISTS= else - LIBLIST="lib\$(LIB)$STLIBEXT" - LIBLINKS="\$(TOPLIBD)/lib\$(LIB)$STLIBEXT" + LIBLIST='lib$(LIB)$(STLIBEXT)' + LIBLINKS='$(TOPLIBD)/lib$(LIB)$(STLIBEXT)' OBJLISTS=OBJS.ST LIBINSTLIST=install-static DEPLIBEXT=$STLIBEXT @@ -886,8 +886,12 @@ AC_ARG_ENABLE([shared], CC_LINK="$CC_LINK_STATIC" ;; *) + # set this now because some logic below may reset SHLIBEXT + DEPLIBEXT=$SHLIBEXT if test "$krb5_force_static" = "yes"; then AC_MSG_RESULT([Forcing static libraries.]) + # avoid duplicate rules generation for AIX and such + SHLIBEXT=.so-nobuild else AC_MSG_RESULT([Enabling shared libraries.]) LIBLIST="$LIBLIST "'lib$(LIB)$(SHLIBEXT)' @@ -904,7 +908,6 @@ AC_ARG_ENABLE([shared], esac OBJLISTS="$OBJLISTS OBJS.SH" fi - DEPLIBEXT=$SHLIBEXT CC_LINK="$CC_LINK_SHARED" if test "$STLIBEXT" = "$SHLIBEXT" ; then STLIBEXT=".a-no-build" @@ -1018,7 +1021,7 @@ mips-sgi-irix6.3) # This is a Kludge; see below SHLIBEXT=.so SHOBJEXT=.o # Kludge follows: (gcc makes n32 object files but ld expects o32, so we reeducate ld) - if test "$GCC" = yes; then + if test "$krb5_cv_prog_gcc" = yes; then LDCOMBINE='ld -n32 -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIB)$(SHLIBSEXT)' else LDCOMBINE='ld -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIB)$(SHLIBSEXT)' @@ -1047,7 +1050,7 @@ mips-sgi-irix*) # untested... mips-sni-sysv4) - if test "$GCC" = yes; then + if test "$krb5_cv_prog_gcc" = yes; then PICFLAGS=-fpic LDCOMBINE='$(CC) -G -Wl,-h -Wl,lib$(LIB)$(SHLIBSEXT)' else @@ -1114,7 +1117,7 @@ mips-*-netbsd*) ;; *-*-solaris*) - if test "$GCC" = yes; then + if test "$krb5_cv_prog_gcc" = yes; then PICFLAGS=-fpic LDCOMBINE='$(CC) -shared -h lib$(LIB)$(SHLIBSEXT)' else @@ -1171,7 +1174,7 @@ mips-*-netbsd*) LDCOMBINE='$(BUILDTOP)/util/makeshlib $(LIBMAJOR).$(LIBMINOR)' SHLIB_EXPFLAGS=' $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' PROFFLAGS=-pg - if test "$gcc" = "yes" ; then + if test "$krb5_cv_prog_gcc" = "yes" ; then CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Xlinker -bex4:$(BUILDTOP)/util/aix.bincmds ' else CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -bex4:$(BUILDTOP)/util/aix.bincmds ' |