From 27c12d61961aaf8edbb895d617df55963750565d Mon Sep 17 00:00:00 2001 From: Geoffrey Noer Date: Thu, 19 Nov 1998 02:22:42 +0000 Subject: [PATCH] Wed Nov 18 18:18:43 1998 Geoffrey Noer * configure.tgt: change refs from cygwin32* to cygwin*. * aclocal.m4: regenerate * configure.in: don't need to call AM_CYGWIN32. * configure: regenerate --- ld/ChangeLog | 3 +++ ld/aclocal.m4 | 48 ++++++++++++++++++++++++++++++++---------------- ld/configure | 22 +++++++++++----------- 3 files changed, 46 insertions(+), 27 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 8d469bf..ae3610a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,6 +1,9 @@ Wed Nov 18 18:18:43 1998 Geoffrey Noer * configure.tgt: change refs from cygwin32* to cygwin*. + * aclocal.m4: regenerate + * configure.in: don't need to call AM_CYGWIN32. + * configure: regenerate Mon Nov 16 22:14:07 1998 DJ Delorie diff --git a/ld/aclocal.m4 b/ld/aclocal.m4 index 1d53543..14e1a36 100644 --- a/ld/aclocal.m4 +++ b/ld/aclocal.m4 @@ -730,33 +730,20 @@ AC_DEFUN(AM_LC_MESSAGES, fi fi]) -# 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". - -dnl AM_CYGWIN32() -AC_DEFUN(AM_CYGWIN32, -[AC_CACHE_CHECK(for Cygwin32 environment, am_cv_cygwin32, -[AC_TRY_COMPILE(,[return __CYGWIN32__;], -am_cv_cygwin32=yes, am_cv_cygwin32=no) -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' @@ -781,6 +768,35 @@ test x"${am_cv_exeext}" != xno && EXEEXT=${am_cv_exeext} AC_MSG_RESULT(${am_cv_exeext}) AC_SUBST(EXEEXT)]) +# 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, +[AC_CACHE_CHECK(for Cygwin32 environment, am_cv_cygwin32, +[AC_TRY_COMPILE(,[return __CYGWIN32__;], +am_cv_cygwin32=yes, am_cv_cygwin32=no) +rm -f conftest*]) +CYGWIN32= +test "$am_cv_cygwin32" = yes && CYGWIN32=yes]) + + # Check to see if we're running under Mingw, without using # AC_CANONICAL_*. If so, set output variable MINGW32 to "yes". # Otherwise set it to "no". diff --git a/ld/configure b/ld/configure index 5f4b065..21a278f 100755 --- a/ld/configure +++ b/ld/configure @@ -3462,9 +3462,9 @@ fi fi -echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 -echo "configure:3467: checking for Cygwin32 environment" >&5 -if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:3467: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'am_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - am_cv_cygwin32=yes + am_cv_cygwin=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - am_cv_cygwin32=no + am_cv_cygwin=no fi rm -f conftest* rm -f conftest* fi -echo "$ac_t""$am_cv_cygwin32" 1>&6 -CYGWIN32= -test "$am_cv_cygwin32" = yes && CYGWIN32=yes +echo "$ac_t""$am_cv_cygwin" 1>&6 +CYGWIN= +test "$am_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6 echo "configure:3496: checking for Mingw32 environment" >&5 if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then @@ -3527,7 +3527,7 @@ echo "configure:3527: checking for executable suffix" >&5 if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - 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' @@ -4012,7 +4012,7 @@ fi case "${host}" in -i[345]86-*-msdos* | i[345]86-*-go32* | i[345]86-*-mingw32* | *-*-cygwin32* | *-*-windows) +i[345]86-*-msdos* | i[345]86-*-go32* | i[345]86-*-mingw32* | *-*-cygwin* | *-*-windows) cat >> confdefs.h <<\EOF #define USE_BINARY_FOPEN 1 EOF -- 2.7.4