Attachment #204133 for bug #252502




datadir     = @datadir@
datarootdir = @datarootdir@

SUBDIRS = src lib ext doc
SRIDBUS = doc ext lib src 
LIBATOMICDIR = gc/libatomic_ops-1.2
MKINSTDIR = @top_srcdir@/mkinstalldirs
INSTALL = @INSTALL@
GAUCHE_VERSION  = @GAUCHE_VERSION@

GOSH = gosh

CONFIG_GENERATED = Makefile config.cache config.log config.status config.threads \
	           libtool configure.lineno autom4*
AUTOCONF_GENERATED = $(CONFIG_GENERATED) configure

TESTRECORD = ./test.record

	   (cd $(LIBATOMICDIR); $(MAKE) distclean; rm -f configure);\
	fi
	(cd winnt; $(MAKE) clean)
	rm -rf $(AUTOCONF_GENERATED) VERSION INSTALL INSTALL.eucjp DIST_EXCLUDE_X

# MacOSX Framework specific stuff
framework: all




LIBS
CPPFLAGS
CPP'
ac_subdirs_all='gc'

# Initialize some variables set by options.
ac_init_help=

  $as_echo_n "(cached) " >&6
else
  ac_check_lib_save_LIBS=$LIBS
LIBS="-lm  -lgc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF

#define HAVE_LIBM 1
_ACEOF

  LIBS="-lm -lgc $LIBS"

fi





subdirs="$subdirs gc"


echo $GAUCHE_VERSION > VERSION

Lines 701-710 Link Here

(-)Gauche-0.8.14.orig/configure.ac (-4 lines)
701	AC_SUBST(CROSS_COMPILING_no)	701	AC_SUBST(CROSS_COMPILING_no)
702		702
703	dnl ===========================================================	703	dnl ===========================================================
704	dnl Configure gc and extensions
705	AC_CONFIG_SUBDIRS(gc)
706
707	dnl ===========================================================
708	dnl Create output files	704	dnl Create output files
709	echo $GAUCHE_VERSION > VERSION	705	echo $GAUCHE_VERSION > VERSION
710	AC_OUTPUT(Makefile	706	AC_OUTPUT(Makefile

Lines 27-33 Link Here

(-)Gauche-0.8.14.orig/ext/Makefile.ext.in (-1 / +1 lines)
27	# These are set by configure	27	# These are set by configure
28	DEFS = @DEFS@	28	DEFS = @DEFS@
29	OPTFLAGS = @OPTFLAGS@	29	OPTFLAGS = @OPTFLAGS@
30	INCLUDES = -I$(srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/gc/include @LOCAL_INC@ $(EXTRA_INCLUDES)	30	INCLUDES = -I$(srcdir) -I$(top_srcdir)/src @LOCAL_INC@ $(EXTRA_INCLUDES)
31	OBJEXT = @OBJEXT@	31	OBJEXT = @OBJEXT@
32	EXEEXT = @EXEEXT@	32	EXEEXT = @EXEEXT@
33	SOEXT = @SHLIB_SO_SUFFIX@	33	SOEXT = @SHLIB_SO_SUFFIX@




# These are set by configure
DEFS     = @DEFS@
OPTFLAGS = @OPTFLAGS@
INCLUDES = -I$(srcdir) @LOCAL_INC@
RANLIB   = @RANLIB@
OBJEXT   = @OBJEXT@
EXEEXT   = @EXEEXT@

# certain circumstances (e.g. MacOSX framework build) it may be overridden.
TARGETLIB=$(LIB_INSTALL_DIR)

INSTALL_HEADERS = gauche.h 
	../gc/include/gc.h ../gc/include/gc_allocator.h \
	../gc/include/gc_config_macros.h ../gc/include/gc_cpp.h \
	../gc/include/gc_inline.h ../gc/include/gc_mark.h \
	../gc/include/gc_pthread_redirects.h ../gc/include/gc_tiny_fl.h \
	../gc/include/gc_typed.h ../gc/include/gc_version.h 
INSTALL_SUBHEADERS = \
	gauche/arch.h gauche/bignum.h gauche/bits.h \
	gauche/builtin-syms.h gauche/char_euc_jp.h gauche/char_none.h \


# build -----------------------------------------------

GCLIB = ../gc/libgc.la

gosh_SOURCES = main.c
gosh_OBJECTS = main.$(OBJEXT)
gosh_LDADD   = -lgauche -lgc
gosh_LDFLAGS = @SHLIB_MAIN_LDFLAGS@

libgauche_LIBRARY = libgauche.$(SOEXT)

	$(LINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS)

relink :
	$(RELINK) $(libgauche_LDFLAGS) libgauche.$(SOEXT) $(libgauche_OBJECTS) $(LIBS)
	$(RELINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT)  $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS)

$(OBJECTS) : $(HEADERS)

paths.$(OBJEXT) : getdir_win.c getdir_dummy.c getdir_darwin.c

libgauche.$(SOEXT) : $(libgauche_OBJECTS) $(GCLIB)
	$(LINK) $(libgauche_LDFLAGS) libgauche.$(SOEXT) $(libgauche_OBJECTS) $(LIBS)
	$(POSTBUILD)

gauche-config$(EXEEXT) : gauche-config.$(OBJEXT)

Return to bug 252502

Lines 769-775 Link Here

(-)Gauche-0.8.14.orig/configure (-4 / +2 lines)
769	LIBS	769	LIBS
770	CPPFLAGS	770	CPPFLAGS
771	CPP'	771	CPP'
772	ac_subdirs_all='gc'
773		772
774	# Initialize some variables set by options.	773	# Initialize some variables set by options.
775	ac_init_help=	774	ac_init_help=
Lines 9296-9302 Link Here
9296	$as_echo_n "(cached) " >&6	9295	$as_echo_n "(cached) " >&6
9297	else	9296	else
9298	ac_check_lib_save_LIBS=$LIBS	9297	ac_check_lib_save_LIBS=$LIBS
9299	LIBS="-lm $LIBS"	9298	LIBS="-lm -lgc $LIBS"
9300	cat >conftest.$ac_ext <<_ACEOF	9299	cat >conftest.$ac_ext <<_ACEOF
9301	/* confdefs.h. */	9300	/* confdefs.h. */
9302	_ACEOF	9301	_ACEOF
Lines 9360-9366 Link Here
9360	#define HAVE_LIBM 1	9359	#define HAVE_LIBM 1
9361	_ACEOF	9360	_ACEOF
9362		9361
9363	LIBS="-lm $LIBS"	9362	LIBS="-lm -lgc $LIBS"
9364		9363
9365	fi	9364	fi
9366		9365
Lines 16437-16443 Link Here
16437		16436
16438		16437
16439		16438
16440	subdirs="$subdirs gc"
16441		16439
16442		16440
16443	echo $GAUCHE_VERSION > VERSION	16441	echo $GAUCHE_VERSION > VERSION

Lines 55-61 Link Here

(-)Gauche-0.8.14.orig/src/Makefile.in (-12 / +5 lines)
55	# These are set by configure	55	# These are set by configure
56	DEFS = @DEFS@	56	DEFS = @DEFS@
57	OPTFLAGS = @OPTFLAGS@	57	OPTFLAGS = @OPTFLAGS@
58	INCLUDES = -I$(srcdir) -I$(srcdir)/../gc/include @LOCAL_INC@	58	INCLUDES = -I$(srcdir) @LOCAL_INC@
59	RANLIB = @RANLIB@	59	RANLIB = @RANLIB@
60	OBJEXT = @OBJEXT@	60	OBJEXT = @OBJEXT@
61	EXEEXT = @EXEEXT@	61	EXEEXT = @EXEEXT@
Lines 111-122 Link Here
111	# certain circumstances (e.g. MacOSX framework build) it may be overridden.	111	# certain circumstances (e.g. MacOSX framework build) it may be overridden.
112	TARGETLIB=$(LIB_INSTALL_DIR)	112	TARGETLIB=$(LIB_INSTALL_DIR)
113		113
114	INSTALL_HEADERS = gauche.h \	114	INSTALL_HEADERS = gauche.h
115	../gc/include/gc.h ../gc/include/gc_allocator.h \
116	../gc/include/gc_config_macros.h ../gc/include/gc_cpp.h \
117	../gc/include/gc_inline.h ../gc/include/gc_mark.h \
118	../gc/include/gc_pthread_redirects.h ../gc/include/gc_tiny_fl.h \
119	../gc/include/gc_typed.h ../gc/include/gc_version.h
120	INSTALL_SUBHEADERS = \	115	INSTALL_SUBHEADERS = \
121	gauche/arch.h gauche/bignum.h gauche/bits.h \	116	gauche/arch.h gauche/bignum.h gauche/bits.h \
122	gauche/builtin-syms.h gauche/char_euc_jp.h gauche/char_none.h \	117	gauche/builtin-syms.h gauche/char_euc_jp.h gauche/char_none.h \
Lines 149-159 Link Here
149		144
150	# build -----------------------------------------------	145	# build -----------------------------------------------
151		146
152	GCLIB = ../gc/libgc.la
153
154	gosh_SOURCES = main.c	147	gosh_SOURCES = main.c
155	gosh_OBJECTS = main.$(OBJEXT)	148	gosh_OBJECTS = main.$(OBJEXT)
156	gosh_LDADD = -lgauche	149	gosh_LDADD = -lgauche -lgc
157	gosh_LDFLAGS = @SHLIB_MAIN_LDFLAGS@	150	gosh_LDFLAGS = @SHLIB_MAIN_LDFLAGS@
158		151
159	libgauche_LIBRARY = libgauche.$(SOEXT)	152	libgauche_LIBRARY = libgauche.$(SOEXT)
Lines 186-192 Link Here
186	$(LINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS)	179	$(LINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS)
187		180
188	relink :	181	relink :
189	$(RELINK) $(libgauche_LDFLAGS) libgauche.$(SOEXT) $(libgauche_OBJECTS) ../gc/.libs/*.o $(LIBS)	182	$(RELINK) $(libgauche_LDFLAGS) libgauche.$(SOEXT) $(libgauche_OBJECTS) $(LIBS)
190	$(RELINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS)	183	$(RELINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS)
191		184
192	$(OBJECTS) : $(HEADERS)	185	$(OBJECTS) : $(HEADERS)
Lines 227-233 Link Here
227	paths.$(OBJEXT) : getdir_win.c getdir_dummy.c getdir_darwin.c	220	paths.$(OBJEXT) : getdir_win.c getdir_dummy.c getdir_darwin.c
228		221
229	libgauche.$(SOEXT) : $(libgauche_OBJECTS) $(GCLIB)	222	libgauche.$(SOEXT) : $(libgauche_OBJECTS) $(GCLIB)
230	$(LINK) $(libgauche_LDFLAGS) libgauche.$(SOEXT) $(libgauche_OBJECTS) ../gc/.libs/*.o $(LIBS)	223	$(LINK) $(libgauche_LDFLAGS) libgauche.$(SOEXT) $(libgauche_OBJECTS) $(LIBS)
231	$(POSTBUILD)	224	$(POSTBUILD)
232		225
233	gauche-config$(EXEEXT) : gauche-config.$(OBJEXT)	226	gauche-config$(EXEEXT) : gauche-config.$(OBJEXT)

Lines 15-23 Link Here

(-)Gauche-0.8.14.orig/Makefile.in (-5 / +4 lines)
15	datadir = @datadir@	15	datadir = @datadir@
16	datarootdir = @datarootdir@	16	datarootdir = @datarootdir@
17		17
18	SUBDIRS = gc src lib ext doc	18	SUBDIRS = src lib ext doc
19	SRIDBUS = doc ext lib src gc	19	SRIDBUS = doc ext lib src
20	LIBATOMICDIR = gc/libatomic_ops-1.2
21	MKINSTDIR = @top_srcdir@/mkinstalldirs	20	MKINSTDIR = @top_srcdir@/mkinstalldirs
22	INSTALL = @INSTALL@	21	INSTALL = @INSTALL@
23	GAUCHE_VERSION = @GAUCHE_VERSION@	22	GAUCHE_VERSION = @GAUCHE_VERSION@
Lines 28-34 Link Here
28	GOSH = gosh	27	GOSH = gosh
29		28
30	CONFIG_GENERATED = Makefile config.cache config.log config.status config.threads \	29	CONFIG_GENERATED = Makefile config.cache config.log config.status config.threads \
31	libtool configure.lineno autom4* gc/autom4*	30	libtool configure.lineno autom4*
32	AUTOCONF_GENERATED = $(CONFIG_GENERATED) configure	31	AUTOCONF_GENERATED = $(CONFIG_GENERATED) configure
33		32
34	TESTRECORD = ./test.record	33	TESTRECORD = ./test.record
Lines 114-120 Link Here
114	(cd $(LIBATOMICDIR); $(MAKE) distclean; rm -f configure);\	113	(cd $(LIBATOMICDIR); $(MAKE) distclean; rm -f configure);\
115	fi	114	fi
116	(cd winnt; $(MAKE) clean)	115	(cd winnt; $(MAKE) clean)
117	rm -rf $(AUTOCONF_GENERATED) VERSION INSTALL INSTALL.eucjp DIST_EXCLUDE_X gc/configure	116	rm -rf $(AUTOCONF_GENERATED) VERSION INSTALL INSTALL.eucjp DIST_EXCLUDE_X
118		117
119	# MacOSX Framework specific stuff	118	# MacOSX Framework specific stuff
120	framework: all	119	framework: all