diff options
author | Ken Raeburn <raeburn@mit.edu> | 1996-05-01 03:30:20 +0000 |
---|---|---|
committer | Ken Raeburn <raeburn@mit.edu> | 1996-05-01 03:30:20 +0000 |
commit | 36b18019927a7882d017300c77f8702019cdf6d6 (patch) | |
tree | cfbda7170fa052b7fc6c59bc4ad51af59e2d1f6f /src/aclocal.m4 | |
parent | 83a51b3fd95676f9d507d4629483fe654375d8ea (diff) | |
download | krb5-36b18019927a7882d017300c77f8702019cdf6d6.tar.gz krb5-36b18019927a7882d017300c77f8702019cdf6d6.tar.xz krb5-36b18019927a7882d017300c77f8702019cdf6d6.zip |
* Makefile.in (tgz-bin, pkgdir): New targets.
(PKGDIR, GZIPPROG): New variables.
* aclocal.m4 (WITH_NETLIB): Don't look for socket lib on Irix.
* aclocal.m4 (MAKE_SUBDIRS): Disable hack that tries to determine if "-k" or
"-i" was given.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7882 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/aclocal.m4')
-rw-r--r-- | src/aclocal.m4 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 38433549c..c70348eed 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -82,9 +82,11 @@ define(MAKE_SUBDIRS,[dnl AC_PUSH_MAKEFILE()dnl changequote(<<<,>>>)dnl -$2::<<< - @case "`echo '$(MAKEFLAGS)'|sed -e 's/ --.*$$//'`" in \ - *[ik]*) e=:;; *) e="exit 1";; esac; \ +$2:: +dnl These don't work well with some versions of GNU make. +dnl @case "`echo '$(MAKEFLAGS)'|sed -e 's/ --.*$$//'`" in \ +dnl *[ik]*) e=:;; *) e="exit 1";; esac; \ +<<< @e="exit 1";\ for i in $(SUBDIRS) ; do \ if test -d $$i ; then \ echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \ @@ -790,7 +792,9 @@ AC_ARG_WITH([netlib], AC_MSG_RESULT("netlib will use \'$withval\'") fi ,dnl -[AC_CHECK_LIB(socket,main) +[if test "`(uname) 2>/dev/null`" != IRIX ; then + AC_CHECK_LIB(socket,main) +fi AC_CHECK_LIB(nsl,main)] )])dnl dnl |