From: Ben Elliston Date: Sun, 27 Dec 1998 01:04:18 +0000 (+0000) Subject: 1998-12-27 Ben Elliston X-Git-Tag: autoconf-2-13-rc1~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c223842a38ef557ec4305a4afb1ae0782a3dd80;p=thirdparty%2Fautoconf.git 1998-12-27 Ben Elliston * acspecific.m4 (AC_CYGWIN): Rename from `AC_CYGWIN32'. * config.sub: Drop `32' from `Cygwin32'. * config.guess: Likewise. --- diff --git a/ChangeLog b/ChangeLog index 454e4eb6..de00a255 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1998-12-27 Ben Elliston + + * acspecific.m4 (AC_CYGWIN): Rename from `AC_CYGWIN32'. + + * config.sub: Drop `32' from `Cygwin32'. + + * config.guess: Likewise. + 1998-12-26 Ben Elliston * autoreconf.sh (stamp): Add missing quote. diff --git a/acspecific.m4 b/acspecific.m4 index 04339565..340d553a 100644 --- 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 1ec70cc1..2960d6e0 100755 --- 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 f7911664..00bea6e6 100755 --- 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 04339565..340d553a 100644 --- 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*