diff options
-rw-r--r-- | winsup/ChangeLog | 5 | ||||
-rwxr-xr-x | winsup/configure | 7 | ||||
-rwxr-xr-x | winsup/configure.in | 5 |
3 files changed, 14 insertions, 3 deletions
diff --git a/winsup/ChangeLog b/winsup/ChangeLog index a104a72..d80f6f4 100644 --- a/winsup/ChangeLog +++ b/winsup/ChangeLog @@ -1,3 +1,8 @@ +2002-02-19 Christopher Faylor <cgf@redhat.com> + + * configure.in: Avoid building w32api or mingw if they don't exist. + * configure: Regenerate. + 2001-12-18 Christopher Faylor <cgf@redhat.com> * Makefile.in: Don't attempt to use zlib directory as a dependency if diff --git a/winsup/configure b/winsup/configure index 8cb175b..8877f33 100755 --- a/winsup/configure +++ b/winsup/configure @@ -916,7 +916,10 @@ fi CXXFLAGS='$(CFLAGS)' -SUBDIRS='w32api cygwin mingw' +SUBDIRS='cygwin' +test -d $srcdir/w32api && SUBDIRS="w32api $SUBDIRS" +test -d $srcdir/mingw && SUBDIRS="$SUBDIRS mingw" + case "$with_cross_host" in ""|*cygwin*) test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib" @@ -931,7 +934,7 @@ subdirs="$SUBDIRS" echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:935: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:938: 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 f1195c2..c588658 100755 --- a/winsup/configure.in +++ b/winsup/configure.in @@ -66,7 +66,10 @@ AC_CANONICAL_SYSTEM LIB_AC_PROG_CC LIB_AC_PROG_CXX -SUBDIRS='w32api cygwin mingw' +SUBDIRS='cygwin' +test -d $srcdir/w32api && SUBDIRS="w32api $SUBDIRS" +test -d $srcdir/mingw && SUBDIRS="$SUBDIRS mingw" + case "$with_cross_host" in ""|*cygwin*) test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib" |