Re: [PATCH]: Cross building and Cygwin fixes.

[Marius Vollmer]

Jan Nieuwenhuizen <address@hidden> writes:

> Please let me know what needs to be done to get this into CVS.

Thanks!  I have applied it (with some changes, see below) to the
'unstable' branch.  It is too late for 1.6.

> +if test "$cross_compiling" = "yes"; then
> +  AC_MSG_CHECKING(guile for build)
> +  GUILE_FOR_BUILD="${GUILE_FOR_BUILD-guile}"
> +else
> +  GUILE_FOR_BUILD='$(top_builddir_absolute)/pre-inst-guile'

I changed this to just

    GUILE_FOR_BUILD='$(preinstguile)'

but did not change am/preinstguile.  This keeps the roles of the
'pre-inst-guile' separate from the 'guile-for-build'.  pre-inst-guile
is used during "make check" for example, and guile-for-build is used
for the doc snarfing.

> +fi   
> +AC_ARG_WITH(guile-for-build,
> +  [  --with-guile-for-build=CC  native guile [...]
                               ^^
> +test -n "$with_guile_for_build" && GUILE_FOR_BUILD="$with_cc_for_build"
                                                             ^^

"GUILE" instead of "CC", no?

> +2002-07-03  Jan Nieuwenhuizen  <address@hidden>
> +
> +     * pre-inst-guile (preinstguile): Initialize with
> +     $(GUILE_FOR_BUILD) configure parameter.

I didn't make this change, see above.  Instead, I defined
snarf2checkedtexi as

  GUILE="$(GUILE_FOR_BUILD)" $(top_srcdir)/scripts/snarf-check-and-output-texi

> -#ifdef HAVE_WINSOCK2_H
> +#if defined (HAVE_WINSOCK2_H) \
> +  && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
>  #include <winsock2.h>
>  #endif

What is the reason for this change?  Wouldn't it be better to fix the
check for <winsock2.h> in configure.in?