* 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

diff --git a/src/ChangeLog b/src/ChangeLog
index 8e3c1152a3c7a0aca5710da8bceaf6b4b34e8f2a..d1632dbe19d8cd3edbff6e0a3ae52f489efa3c96 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+Tue Apr 30 23:25:07 1996  Ken Raeburn  <raeburn@cygnus.com>
+
+       * 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.
+
 Wed Apr 24 03:49:06 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * aclocal.m4 (V5_USE_SHARED_LIB): Remove another dependency in the

diff --git a/src/Makefile.in b/src/Makefile.in
index aef4af1f474518327b9f8b8255c25cb1db8c5c84..3c104065d5e3d152e457a32d42cbce0cacefd1db 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -80,6 +80,17 @@ dist: $(DISTFILES)
        tar chzf `cat .fname`.tar.gz `cat .fname`
        rm -rf `cat .fname` .fname
 
+GZIPPROG= gzip -9v
+PKGDIR=`pwd`/pkgdir
+pkgdir:
+       if test ! -d $(PKGDIR); then mkdir $(PKGDIR); else true; fi
+tgz-bin: pkgdir
+       rm -rf $(PKGDIR)/install cns5-bin.tgz
+       mkdir $(PKGDIR)/install
+       $(MAKE) install DESTDIR=$(PKGDIR)/install
+       (cd $(PKGDIR)/install && tar cf - usr/cygnus) | $(GZIPPROG) > cns5-bin.tgz
+       rm -rf $(PKGDIR)/install
+
 # Macintosh build process...
 
 # Build all things for the Mac build, which need to be built on

diff --git a/src/acconfig.h b/src/acconfig.h
index efdcaa494f628da3f76bae8b2a22a8b5ab00357a..5005671a5cc4bdc3ea65c2f03545ac733424d046 100644 (file)
--- a/src/acconfig.h
+++ b/src/acconfig.h
@@ -3,6 +3,9 @@
    as aclocal.m4, so autoreconf causes autoheader to find it. Nothing actually
    includes this file, it is always processed into something else. */
 
+/* Don't use too large a block, because the autoheader processing can't
+   handle it on some systems.  */
+
 #undef ANSI_STDIO
 #undef HAS_SETVBUF
 #undef HAS_STDLIB_H

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 38433549c92386b45bf3368ed579b49de3547ff9..c70348eed511c6fed542585d18545cba825a4929 100644 (file)
--- 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