=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/configure.in,v retrieving revision 1.40 retrieving revision 1.45 diff -u -p -r1.40 -r1.45 --- OpenXM_contrib2/asir2000/configure.in 2012/08/27 05:05:58 1.40 +++ OpenXM_contrib2/asir2000/configure.in 2015/08/06 09:01:26 1.45 @@ -1,10 +1,10 @@ -dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.39 2012/05/30 02:24:33 ohara Exp $ +dnl $OpenXM: OpenXM_contrib2/asir2000/configure.in,v 1.44 2015/08/04 06:57:51 ohara Exp $ -AC_INIT +AC_INIT(asir,1.15) AC_CONFIG_SRCDIR([LICENSE]) -AC_PREREQ(2.61) +AC_PREREQ(2.69) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(asir, 20030307) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE dnl AM_PROG_AS @@ -34,7 +34,7 @@ elif test `basename ./"${CC}"` = "icc" ; then CFLAGS="-g -O" fi -GC=gc6.8 +GC=gc-7.4.2 AC_ARG_WITH([asir-gc], [ --with-asir-gc modify Boehm's GC [[yes]]], [with_asir_gc=${withval}],[with_asir_gc=yes]) @@ -52,6 +52,7 @@ if test -n "${host_alias}" ; then GC_CONFIGURE_ARGS="--host=${host_alias} ${GC_CONFIGURE_ARGS}" fi +AC_DEFINE([GC7]) AC_SUBST([ASIR_GCLIB]) AC_SUBST([GCLIB]) AC_SUBST([GCINC]) @@ -179,7 +180,7 @@ case "${host}" in asm_obj="${i386_elf_obj}" AC_DEFINE([_BSD_SOURCE]) ;; -*-*-cygwin*) +[i[3-6]86-*-cygwin*]|x86-*-cygwin*) asm_obj="${i386_aout_obj}" ;; [i[3-6]86-*-interix*]) @@ -202,6 +203,9 @@ sparc-sun-solaris2.*) *-apple-darwin*) asm_obj="${generic_obj}" AC_DEFINE([__DARWIN__]) + if test -d /usr/X11/include -a x"${X_CFLAGS}" = x ; then + X_CFLAGS=-I/usr/X11/include + fi ;; arm*-*-linux*) asm_obj="${generic_obj}" @@ -209,12 +213,17 @@ arm*-*-linux*) CFLAGS="${CFLAGS} -fsigned-char" fi ;; +*-*-mingw32) + WSLIB="-lws2_32" + asm_obj="${generic_obj}" + ;; *) asm_obj="${generic_obj}" ;; esac AC_SUBST([asm_obj]) +AC_SUBST([WSLIB]) dnl for Solaris 2.x AC_CHECK_FUNC(socket, , [AC_CHECK_LIB(socket,socket)])