aclocal.m4 (_MAKE_SUBDIRS): Change subdir recursion so that

	a missing subdirectory is skipped.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6571 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index 2a82b2330738ea4b4f8332f9ff665abd27b98a2e..011f5683d7699789ae86c76cfa76db85b9c84e7d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 22 18:19:39 1995    <tytso@rsts-11.mit.edu>
+
+       * aclocal.m4 (_MAKE_SUBDIRS): Change subdir recursion so that 
+               a missing subdirectory is skipped.  
 
 Mon Aug 21 16:42:42 EDT 1995   Paul Park       (pjpark@mit.edu)
        * Makefile.in - Change mkdir to mkdir -p.

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index c2d322355251f337934a81e3ae7c0022d61ee82b..2fa2f710808f8eb4e809399e0c103f4a64e21455 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -88,10 +88,14 @@ $2::<<<
        @case "`echo '$(MAKEFLAGS)'|sed -e 's/ --.*$$//'`" in \
                *[ik]*) e=:;; *) e="exit 1";; esac; \
        for i in $(SUBDIRS) ; do \
-               if (cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \
-                       $(MAKE) CC="$(CC)" CCOPTS="$(CCOPTS)" \
-                       CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$3<<<) then :; \
-               else $$e; fi; \
+               if test -d $$i ; then \
+                       echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \
+                       if (cd $$i ; $(MAKE) CC="$(CC)" CCOPTS="$(CCOPTS)" \
+                           CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$3<<<) then :; \
+                       else $$e; fi; \
+               else \
+                       echo "Skipping missing directory $(CURRENT_DIR)$$i" ; \
+               fi \
        done>>>
 changequote([,])dnl
 AC_POP_MAKEFILE()dnl