diff options
| -rw-r--r-- | winsup/ChangeLog | 11 | ||||
| -rwxr-xr-x | winsup/configure | 14 | ||||
| -rwxr-xr-x | winsup/configure.in | 12 |
3 files changed, 30 insertions, 7 deletions
diff --git a/winsup/ChangeLog b/winsup/ChangeLog index bbc50e7..824bfae 100644 --- a/winsup/ChangeLog +++ b/winsup/ChangeLog @@ -1,11 +1,18 @@ +Sat Jun 17 13:50:04 2000 Christopher Faylor <cgf@cygnus.com> + + * configure.in: Detect "cross-hosting" situation and add a subset of + directories to SUBDIRS. + * configure: Regenerate. + Thu May 25 18:39:24 2000 Christopher Faylor <cgf@cygnus.com> * configure.in: Don't assume that cinstall directory exists. + * configure: Regenerate 2000-05-24 DJ Delorie <dj@cygnus.com> - * Makefile.common (%.o): further simplify, add "..." to make it - obvious it's an abbreviated command line. + * Makefile.common (%.o): further simplify, add "..." to make it obvious + it's an abbreviated command line. Thu May 18 14:33:05 2000 Christopher Faylor <cgf@cygnus.com> diff --git a/winsup/configure b/winsup/configure index 108aa36..21361f9 100755 --- a/winsup/configure +++ b/winsup/configure @@ -826,12 +826,20 @@ else fi -SUBDIRS="cygwin w32api mingw utils doc" -test -d $srcdir/cinstall && SUBDIRS="$SUBDIRS cinstall" +SUBDIRS='cygwin w32api mingw' +case "$with_cross_host" in + ""|*cygwin*) + SUBDIRS="$SUBDIRS utils" + test -d $srcdir/cinstall && SUBDIRS="$SUBDIRS cinstall" + SUBDIRS="$SUBDIRS doc" + ;; +esac + subdirs="$SUBDIRS" + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:835: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:843: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 diff --git a/winsup/configure.in b/winsup/configure.in index f31cfa9..285a6c9 100755 --- a/winsup/configure.in +++ b/winsup/configure.in @@ -57,9 +57,17 @@ AC_CANONICAL_SYSTEM LIB_AC_PROG_CC -SUBDIRS="cygwin w32api mingw utils doc" -test -d $srcdir/cinstall && SUBDIRS="$SUBDIRS cinstall" +SUBDIRS='cygwin w32api mingw' +case "$with_cross_host" in + ""|*cygwin*) + SUBDIRS="$SUBDIRS utils" + test -d $srcdir/cinstall && SUBDIRS="$SUBDIRS cinstall" + SUBDIRS="$SUBDIRS doc" + ;; +esac + AC_CONFIG_SUBDIRS($SUBDIRS) + AC_PROG_MAKE_SET AC_SUBST(SUBDIRS) |