1998-12-27 Ben Elliston <bje@cygnus.com>

	* acspecific.m4 (AC_CYGWIN): Rename from `AC_CYGWIN32'.
	* config.sub: Drop `32' from `Cygwin32'.
	* config.guess: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 454e4eb62ffdc3b9c62cec8db97afb3d07b053d9..de00a255455f72257cd38cd2d166df4635bc0600 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1998-12-27  Ben Elliston  <bje@cygnus.com>
+
+       * acspecific.m4 (AC_CYGWIN): Rename from `AC_CYGWIN32'.
+       
+       * config.sub: Drop `32' from `Cygwin32'.
+
+       * config.guess: Likewise.
+
 1998-12-26  Ben Elliston  <bje@cygnus.com>
 
        * autoreconf.sh (stamp): Add missing quote.

diff --git a/acspecific.m4 b/acspecific.m4
index 04339565db990d19d194715554ff61253eaf54c5..340d553aa9ecb8a3171e335bce95311f2162ebe5 100644 (file)
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -2137,7 +2137,7 @@ dnl
             case "$arg" in
               -lkernel32)
                 case "$canonical_host_type" in
-                  *-*-cygwin32)
+                  *-*-cygwin*)
                     arg=
                   ;;
                   *)
@@ -2611,15 +2611,19 @@ AC_SUBST(X_LIBS)dnl
 AC_SUBST(X_EXTRA_LIBS)dnl
 ])
 
-dnl Check for cygwin32.  This is a way to set the right value for
+dnl Check for Cygwin.  This is a way to set the right value for
 dnl EXEEXT.
-AC_DEFUN(AC_CYGWIN32,
-[AC_CACHE_CHECK(for cygwin32 environment, ac_cv_cygwin32,
-[AC_TRY_COMPILE(,[return __CYGWIN32__;],
-ac_cv_cygwin32=yes, ac_cv_cygwin32=no)
+AC_DEFUN(AC_CYGWIN,
+[AC_CACHE_CHECK(for Cygwin environment, ac_cv_cygwin,
+[AC_TRY_COMPILE(,[
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;],
+ac_cv_cygwin=yes, ac_cv_cygwin=no)
 rm -f conftest*])
-CYGWIN32=
-test "$ac_cv_cygwin32" = yes && CYGWIN32=yes])
+CYGWIN=
+test "$ac_cv_cygwin" = yes && CYGWIN=yes])
 
 dnl Check for mingw32.  This is another way to set the right value for
 dnl EXEEXT.
@@ -2632,15 +2636,15 @@ MINGW32=
 test "$ac_cv_mingw32" = yes && MINGW32=yes])
 
 dnl Check for the extension used for executables.  This knows that we
-dnl add .exe for cygwin32 or mingw32.  Otherwise, it compiles a test
+dnl add .exe for Cygwin or mingw32.  Otherwise, it compiles a test
 dnl executable.  If this is called, the executable extensions will be
 dnl automatically used by link commands run by the configure script.
 AC_DEFUN(AC_EXEEXT,
-[AC_REQUIRE([AC_CYGWIN32])
+[AC_REQUIRE([AC_CYGWIN])
 AC_REQUIRE([AC_MINGW32])
 AC_MSG_CHECKING([for executable suffix])
 AC_CACHE_VAL(ac_cv_exeext,
-[if test "$CYGWIN32" = yes || test "$MINGW32" = yes; then
+[if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
   ac_cv_exeext=.exe
 else
   rm -f conftest*

diff --git a/config.guess b/config.guess
index 1ec70cc19e7cbaf69e28374156c61cba220cc94b..2960d6e0d26e9ed7128c007abc5a45f5b08c857f 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -523,13 +523,13 @@ EOF
        echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
        exit 0 ;;
     i*:CYGWIN*:*)
-       echo ${UNAME_MACHINE}-pc-cygwin32
+       echo ${UNAME_MACHINE}-pc-cygwin
        exit 0 ;;
     i*:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
        exit 0 ;;
     p*:CYGWIN*:*)
-       echo powerpcle-unknown-cygwin32
+       echo powerpcle-unknown-cygwin
        exit 0 ;;
     prep*:SunOS:5.*:*)
        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

diff --git a/config.sub b/config.sub
index f79116645876191c21f215aca8e6c5d027992ad3..00bea6e6aaf93fb77bd94582dd3046d99f6dcbdc 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -713,7 +713,7 @@ case $os in
              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-             | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+             | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
              | -mingw32* | -linux-gnu* | -uxpv* | -beos*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 04339565db990d19d194715554ff61253eaf54c5..340d553aa9ecb8a3171e335bce95311f2162ebe5 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -2137,7 +2137,7 @@ dnl
             case "$arg" in
               -lkernel32)
                 case "$canonical_host_type" in
-                  *-*-cygwin32)
+                  *-*-cygwin*)
                     arg=
                   ;;
                   *)
@@ -2611,15 +2611,19 @@ AC_SUBST(X_LIBS)dnl
 AC_SUBST(X_EXTRA_LIBS)dnl
 ])
 
-dnl Check for cygwin32.  This is a way to set the right value for
+dnl Check for Cygwin.  This is a way to set the right value for
 dnl EXEEXT.
-AC_DEFUN(AC_CYGWIN32,
-[AC_CACHE_CHECK(for cygwin32 environment, ac_cv_cygwin32,
-[AC_TRY_COMPILE(,[return __CYGWIN32__;],
-ac_cv_cygwin32=yes, ac_cv_cygwin32=no)
+AC_DEFUN(AC_CYGWIN,
+[AC_CACHE_CHECK(for Cygwin environment, ac_cv_cygwin,
+[AC_TRY_COMPILE(,[
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;],
+ac_cv_cygwin=yes, ac_cv_cygwin=no)
 rm -f conftest*])
-CYGWIN32=
-test "$ac_cv_cygwin32" = yes && CYGWIN32=yes])
+CYGWIN=
+test "$ac_cv_cygwin" = yes && CYGWIN=yes])
 
 dnl Check for mingw32.  This is another way to set the right value for
 dnl EXEEXT.
@@ -2632,15 +2636,15 @@ MINGW32=
 test "$ac_cv_mingw32" = yes && MINGW32=yes])
 
 dnl Check for the extension used for executables.  This knows that we
-dnl add .exe for cygwin32 or mingw32.  Otherwise, it compiles a test
+dnl add .exe for Cygwin or mingw32.  Otherwise, it compiles a test
 dnl executable.  If this is called, the executable extensions will be
 dnl automatically used by link commands run by the configure script.
 AC_DEFUN(AC_EXEEXT,
-[AC_REQUIRE([AC_CYGWIN32])
+[AC_REQUIRE([AC_CYGWIN])
 AC_REQUIRE([AC_MINGW32])
 AC_MSG_CHECKING([for executable suffix])
 AC_CACHE_VAL(ac_cv_exeext,
-[if test "$CYGWIN32" = yes || test "$MINGW32" = yes; then
+[if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
   ac_cv_exeext=.exe
 else
   rm -f conftest*