diff options
| author | Ken Raeburn <raeburn@mit.edu> | 1999-09-01 19:53:45 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 1999-09-01 19:53:45 +0000 |
| commit | f20ec57a660b124feba9d3358de38cd6cd99b0be (patch) | |
| tree | 8d92ea37e3bf0bce01b4f2069b2cf9db7c2dfe2d /src | |
| parent | 3d8346b4c1911d90a458e4fb456cddf95d79ba4d (diff) | |
| download | krb5-f20ec57a660b124feba9d3358de38cd6cd99b0be.tar.gz krb5-f20ec57a660b124feba9d3358de38cd6cd99b0be.tar.xz krb5-f20ec57a660b124feba9d3358de38cd6cd99b0be.zip | |
rhapsody and 'make -k' fixes from 1.1 branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11758 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/ChangeLog | 8 | ||||
| -rw-r--r-- | src/config/config.guess | 13 | ||||
| -rw-r--r-- | src/config/config.sub | 2 | ||||
| -rw-r--r-- | src/config/post.in | 8 |
4 files changed, 27 insertions, 4 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 5ef3724265..9d885573eb 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,11 @@ +1999-09-01 Ken Raeburn <raeburn@mit.edu> + + * config.guess: Recognize Rhapsody OS. + * config.sub: Recognize OS name "rhapsody*". + + * post.in (*-recurse): If an error occurs when using -k, report an + error after finishing all the subdirectories. + 1999-08-13 Brad Thompson <yak@mit.edu> * config.sub: Now recognizes MacOS 10 as a valid OS. diff --git a/src/config/config.guess b/src/config/config.guess index c4cdae72f4..98fea7b84b 100644 --- a/src/config/config.guess +++ b/src/config/config.guess @@ -810,6 +810,19 @@ EOF BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit 0 ;; +# MIT addition + Power\ Macintosh:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; +# MIT addition + powerpc:Rhapsody:*:*) + echo powerpc-unknown-rhapsody${UNAME_RELEASE} + exit 0 ;; +# MIT addition + i?86:Rhapsody:*:*) + echo i386-unknown-rhapsody${UNAME_RELEASE} + exit 0 ;; +# MIT addition Power\ Macintosh:Mac\ OS:*:*) echo powerpc-apple-macos${UNAME_RELEASE} exit 0 ;; diff --git a/src/config/config.sub b/src/config/config.sub index 3274dc2375..9952634246 100644 --- a/src/config/config.sub +++ b/src/config/config.sub @@ -714,7 +714,7 @@ case $os in | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -macos*) + | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -macos* | -rhapsody*) # Remember, each alternative MUST END IN *, to match a version number. ;; -linux*) diff --git a/src/config/post.in b/src/config/post.in index 82bf72882e..6a318288a4 100644 --- a/src/config/post.in +++ b/src/config/post.in @@ -54,12 +54,13 @@ $(srcdir)/$(thisconfigdir)/configure: $(srcdir)/$(thisconfigdir)/configure.in \ all-recurse clean-recurse distclean-recurse install-recurse check-recurse Makefiles-recurse: @case "`echo 'x$(MFLAGS)'|sed -e 's/^x//' -e 's/ --.*$$//'`" \ - in *[ik]*) e=:;; *) e="exit 1";; esac; \ + in *[ik]*) e="status=1" ;; *) e="exit 1";; esac; \ if test -z "$(MY_SUBDIRS)" ; then \ do_subdirs="$(SUBDIRS)" ; \ else \ do_subdirs="$(MY_SUBDIRS)" ; \ fi; \ + status=0; \ if test -n "$$do_subdirs" && test -z "$(NORECURSE)"; then \ for i in $$do_subdirs ; do \ if test -d $$i ; then \ @@ -68,7 +69,7 @@ all-recurse clean-recurse distclean-recurse install-recurse check-recurse Makefi echo "making $$target in $(CURRENT_DIR)$$i..."; \ if (cd $$i ; $(MAKE) CC="$(CC)" CCOPTS="$(CCOPTS)" \ CURRENT_DIR=$(CURRENT_DIR)$$i/ $$target) then :; \ - else $$e; fi; \ + else eval $$e; fi; \ ;; \ esac; \ else \ @@ -76,4 +77,5 @@ all-recurse clean-recurse distclean-recurse install-recurse check-recurse Makefi fi; \ done; \ else :; \ - fi + fi;\ + exit $$status |