This file is part of mingw-cross-env. See doc/index.html for further information. diff -ruN guile-1.8.7.orig/configure guile-1.8.7/configure --- guile-1.8.7.orig/configure 2009-07-05 22:25:00.000000000 +0200 +++ guile-1.8.7/configure 2010-04-10 07:35:25.000000000 +0200 @@ -35057,6 +35057,7 @@ $as_echo_n "checking whether pthread_attr_getstack works for the main thread... " >&6; } old_CFLAGS="$CFLAGS" CFLAGS="$PTHREAD_CFLAGS $CFLAGS" +if test "$cross_compiling" = "no"; then if test "$cross_compiling" = yes; then { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -35140,6 +35141,9 @@ fi +else +works=no +fi CFLAGS="$old_CFLAGS" { $as_echo "$as_me:$LINENO: result: $works" >&5 $as_echo "$works" >&6; } diff -ruN guile-1.8.7.orig/configure.in guile-1.8.7/configure.in --- guile-1.8.7.orig/configure.in 2009-07-05 20:40:06.000000000 +0200 +++ guile-1.8.7/configure.in 2010-04-10 07:27:37.000000000 +0200 @@ -1374,6 +1374,7 @@ AC_MSG_CHECKING(whether pthread_attr_getstack works for the main thread) old_CFLAGS="$CFLAGS" CFLAGS="$PTHREAD_CFLAGS $CFLAGS" +if test "$cross_compiling" = "no"; then AC_RUN_IFELSE([AC_LANG_SOURCE([[ #if HAVE_PTHREAD_ATTR_GETSTACK #include @@ -1404,6 +1405,9 @@ AC_DEFINE(PTHREAD_ATTR_GETSTACK_WORKS, [1], [Define when pthread_att_get_stack works for the main thread])], [works=no], []) +else +works=no +fi CFLAGS="$old_CFLAGS" AC_MSG_RESULT($works) diff -ruN guile-1.8.7.orig/guile-readline/configure guile-1.8.7/guile-readline/configure --- guile-1.8.7.orig/guile-readline/configure 2009-07-05 22:24:45.000000000 +0200 +++ guile-1.8.7/guile-readline/configure 2010-04-10 07:36:18.000000000 +0200 @@ -12353,7 +12353,7 @@ fi -for termlib in ncurses curses termcap terminfo termlib ; do +for termlib in ncurses curses termcap terminfo termlib pdcurses ; do as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgoto" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking for tgoto in -l${termlib}" >&5 $as_echo_n "checking for tgoto in -l${termlib}... " >&6; } diff -ruN guile-1.8.7.orig/guile-readline/configure.in guile-1.8.7/guile-readline/configure.in --- guile-1.8.7.orig/guile-readline/configure.in 2009-07-04 00:19:22.000000000 +0200 +++ guile-1.8.7/guile-readline/configure.in 2010-04-10 07:13:43.000000000 +0200 @@ -33,7 +33,7 @@ fi AC_SUBST(EXTRA_DEFS) -for termlib in ncurses curses termcap terminfo termlib ; do +for termlib in ncurses curses termcap terminfo termlib pdcurses ; do AC_CHECK_LIB(${termlib}, tgoto, [LIBS="-l${termlib} $LIBS"; break]) done diff -ruN guile-1.8.7.orig/libguile/__scm.h guile-1.8.7/libguile/__scm.h --- guile-1.8.7.orig/libguile/__scm.h 2009-07-04 00:18:59.000000000 +0200 +++ guile-1.8.7/libguile/__scm.h 2010-04-10 07:58:48.000000000 +0200 @@ -150,7 +150,7 @@ which should be exported or imported in the resulting dynamic link library (DLL) in the Win32 port. */ -#if defined (SCM_IMPORT) +#if defined (SCM_IMPORT) && defined (USE_DLL_IMPORT) # define SCM_API __declspec (dllimport) extern #elif defined (SCM_EXPORT) || defined (DLL_EXPORT) # define SCM_API __declspec (dllexport) extern