From e37b4526fc387b98939bf9b69be85db0daf0d5d3 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 14 May 2007 19:35:32 +0000 Subject: Solaris sh (POSIX shell) does not support the Bash substitution syntax. Add a different workaround for this Cygwin shell bug (however note that we are NOT going to go out of our way to work around Cygwin bugs - you need to report those upstream folks!) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5830 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- configure.in | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index 71388a34d..c7c45fc2c 100644 --- a/configure.in +++ b/configure.in @@ -317,20 +317,20 @@ AC_C_BIGENDIAN AC_CHECK_SIZEOF(short, 2) AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(long, 4) -if test ${ac_cv_sizeof_short:0:1} -eq 2; then +if test $ac_cv_sizeof_short -eq 2; then AC_DEFINE(U16,unsigned short) fi -if test ${ac_cv_sizeof_int:0:1} -eq 4; then +if test $ac_cv_sizeof_int -eq 4; then AC_DEFINE(U32,unsigned) else - if test ${ac_cv_sizeof_long:0:1} -eq 4; then + if test $ac_cv_sizeof_long -eq 4; then AC_DEFINE(U32,unsigned long) fi fi -if test ${ac_cv_sizeof_int:0:1} -eq 8; then +if test $ac_cv_sizeof_int -eq 8; then AC_DEFINE(U64,unsigned) else - if test ${ac_cv_sizeof_long:0:1} -eq 8; then + if test $ac_cv_sizeof_long -eq 8; then AC_DEFINE(U64,unsigned long) fi fi @@ -610,6 +610,10 @@ UNINSTALL_DESKTOP="" case $uname in CYGWIN* | MINGW*) dnl Cygwin environment... + # Recent versions of Cygwin are seriously broken and the size + # checks don't work because the shell puts out \r\n instead of + # \n. Here we just force U32 to be defined to "unsigned"... + AC_DEFINE(U32,unsigned) CFLAGS="-mwindows -DWIN32 $CFLAGS" CXXFLAGS="-mwindows -DWIN32 $CXXFLAGS" LDFLAGS="-mwindows $LDFLAGS" -- cgit v1.2.3