Wed Nov 18 20:12:03 1998 Geoffrey Noer <noer@cygnus.com>

* aclocal.m4: regenerate
        * configure: regenerate

bfd/ChangeLog

@@ -1,3 +1,8 @@
+Wed Nov 18 20:12:03 1998  Geoffrey Noer  <noer@cygnus.com>
+
+	* aclocal.m4: regenerate
+	* configure: regenerate
+
 Tue Nov 17 20:23:35 1998  Richard Henderson  <rth@cygnus.com>
 
 	* elf-bfd.h (struct elf_link_hash_entry): Add vtable_entries_size.

bfd/aclocal.m4

@@ -266,8 +266,8 @@ case "$host" in
   CFLAGS="$CFLAGS -belf"
   ;;
 
-*-*-cygwin32*)
-  AM_SYS_LIBTOOL_CYGWIN32
+*-*-cygwin*)
+  AM_SYS_LIBTOOL_CYGWIN
   ;;
 
 esac
@@ -459,8 +459,8 @@ AC_MSG_RESULT([$NM])
 AC_SUBST(NM)
 ])
 
-# AM_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32
-AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN32,
+# AM_SYS_LIBTOOL_CYGWIN - find tools needed on cygwin
+AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN,
 [AC_CHECK_TOOL(DLLTOOL, dlltool, false)
 AC_CHECK_TOOL(AS, as, false)
 ])
@@ -511,9 +511,24 @@ AC_DEFUN(AM_MAINTAINER_MODE,
 ]
 )
 
+# Check to see if we're running under Cygwin, without using
+# AC_CANONICAL_*.  If so, set output variable CYGWIN to "yes".
+# Otherwise set it to "no".
+
+dnl AM_CYGWIN()
+AC_DEFUN(AM_CYGWIN,
+[AC_CACHE_CHECK(for Cygwin environment, am_cv_cygwin,
+[AC_TRY_COMPILE(,[return __CYGWIN__;],
+am_cv_cygwin=yes, am_cv_cygwin=no)
+rm -f conftest*])
+CYGWIN=
+test "$am_cv_cygwin" = yes && CYGWIN=yes])
+
 # Check to see if we're running under Cygwin32, without using
 # AC_CANONICAL_*.  If so, set output variable CYGWIN32 to "yes".
 # Otherwise set it to "no".
+# Note: Although Cygwin32 has changed names, for now we keep the
+# old macro around...
 
 dnl AM_CYGWIN32()
 AC_DEFUN(AM_CYGWIN32,
@@ -524,20 +539,21 @@ rm -f conftest*])
 CYGWIN32=
 test "$am_cv_cygwin32" = yes && CYGWIN32=yes])
 
+
 # Check to see if we're running under Win32, without using
 # AC_CANONICAL_*.  If so, set output variable EXEEXT to ".exe".
 # Otherwise set it to "".
 
 dnl AM_EXEEXT()
-dnl This knows we add .exe if we're building in the Cygwin32
+dnl This knows we add .exe if we're building in the Cygwin
 dnl environment. But if we're not, then it compiles a test program
 dnl to see if there is a suffix for executables.
 AC_DEFUN(AM_EXEEXT,
-[AC_REQUIRE([AM_CYGWIN32])
+[AC_REQUIRE([AM_CYGWIN])
 AC_REQUIRE([AM_MINGW32])
 AC_MSG_CHECKING([for executable suffix])
 AC_CACHE_VAL(am_cv_exeext,
-[if test "$CYGWIN32" = yes || test "$MINGW32" = yes; then
+[if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
 am_cv_exeext=.exe
 else
 cat > am_c_test.c << 'EOF'