===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.46
diff -u -p -r1.40 -r1.46
--- OpenXM_contrib2/asir2000/Makefile.am	2013/12/20 02:02:23	1.40
+++ OpenXM_contrib2/asir2000/Makefile.am	2015/08/14 07:36:59	1.46
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.39 2012/12/17 07:20:44 noro Exp $
+## $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.45 2015/08/06 09:01:26 ohara Exp $
 
 AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
 if USE_PLOT
@@ -15,16 +15,18 @@ asir_SOURCES  = parse/main.c
 asir_LDADD    = libasir.a @ASIR_GCLIB@
 CLEANFILES    = ${asir_LDADD} asir-openxm-${VERSION}.tgz
 
-GC_TAR_GZ     = gc-7.2b.tar.gz
+GC_TAR_GZ     = gc-7.4.2.tar.gz
 GC_PATCH      = gc-7.diff gc-7.0-risa.diff
+LIB_ATOMIC     = libatomic_ops-7.4.0
+LIB_ATOMIC_TAR_GZ     = ${LIB_ATOMIC}.tar.gz
 #GC_TAR_GZ     = ${GC}.tar.gz
 #GC_PATCH      = gc6.diff gc6-risa.diff
-GC_MASTER_SITE=ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/
+GC_MASTER_SITE=http://www.math.kobe-u.ac.jp/pub/OpenXM/misc/
 OX_FETCH      = ${bindir}/oxfetch.sh
 
 DEFS     = @DEFS@ -DASIR_LIBDIR=\"${asirdir}\"
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \
-           @GCINC@ @PARIINC@ @X_CFLAGS@
+AM_CPPFLAGS = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \
+           -I${prefix}/include @GCINC@ @PARIINC@ @X_CFLAGS@
 
 GLIB  = @ASIR_GCLIB@
 ALIB  = asm/libasm.a
@@ -33,10 +35,10 @@ ELIB  = engine/libca.a
 FLIB  = fft/libdft.a
 IOLIB = io/libio.a
 PLIB  = parse/libparse.a
-GMPLIB = ${libdir}/libgmp.a
+GMPLIB = -L ${libdir} -lmpfr -lgmp
 
 ASIRLIB  = ${BLIB} ${PLIB} ${IOLIB} ${PLLIB} ${ELIB} ${FLIB} ${ALIB}
-LIBS     = @LIBS@ @GCLIB@ @PARILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} ${GMPLIB} -lm ${EXTRALIBS}
+LIBS     = @LIBS@ @GCLIB@ @PARILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} ${GMPLIB} -lm @WSLIB@ ${EXTRALIBS}
 # EXTRALIBS = @EXTRALIBS@
 
 all-recursive: ${GLIB}
@@ -48,11 +50,13 @@ libasir-gc.a: ${GC_PATCH}
 	-if [ ! -f ${top_srcdir}/.gc_fetch_done ]; then \
 		if [ ! -f ${GC_DISTDIR}/${GC_TAR_GZ} ]; then \
 			${OX_FETCH} ${GC_MASTER_SITE}${GC_TAR_GZ} ${GC_DISTDIR}; \
+			${OX_FETCH} ${GC_MASTER_SITE}${LIB_ATOMIC_TAR_GZ} ${GC_DISTDIR}; \
 		fi ; \
 		touch ${top_srcdir}/.gc_fetch_done ; \
 	fi
 	-if [ ! -f ${top_srcdir}/.gc_risa_done ]; then \
 	    (cd ${top_srcdir}; tar xzvf ${GC_DISTDIR}/${GC_TAR_GZ}) ; \
+	    (cd ${top_srcdir}/${GC}; tar xzvf ${GC_DISTDIR}/${LIB_ATOMIC_TAR_GZ}; mv ${LIB_ATOMIC} libatomic_ops) ; \
 		for i in ${GC_PATCH} ; do \
 	    (cd ${top_srcdir}/${GC}; patch -p1 < ../$$i) ; \
 		done ; \