1 diff -urN ../guile-1.4/ChangeLog ./ChangeLog
2 --- ../guile-1.4/ChangeLog Fri Jun 2 15:17:01 2000
3 +++ ./ChangeLog Mon Jun 5 15:18:32 2000
5 +2000-06-05 <janneke@gnu.org>
7 + * guile-config/cross-guile-config.in: Simple shell script to
8 + take over guile-config's functionality for cross-compilation.
9 + It will be installed as ${target}-guile-config.
11 + * guile-config/Makefile.am: Provide for cross-guile-config.in
14 2000-06-21 Mikael Djurfeldt <mdj@thalamus.nada.kth.se>
17 diff -urN ../guile-1.4/configure.in ./configure.in
18 --- ../guile-1.4/configure.in Fri Jun 2 08:44:27 2000
19 +++ ./configure.in Mon Jun 5 15:13:58 2000
21 dnl Boston, MA 02111-1307, USA.
25 . $srcdir/GUILE-VERSION
26 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
28 diff -urN ../guile-1.4/guile-config/Makefile.am ./guile-config/Makefile.am
29 --- ../guile-1.4/guile-config/Makefile.am Wed Jan 12 22:42:41 2000
30 +++ ./guile-config/Makefile.am Mon Jun 5 15:17:37 2000
32 ## to the Free Software Foundation, Inc., 59 Temple Place, Suite
33 ## 330, Boston, MA 02111-1307 USA
35 -bin_SCRIPTS=guile-config
36 -CLEANFILES=guile-config
37 -EXTRA_DIST=guile-config.in guile.m4
38 +bin_SCRIPTS=guile-config @target@-guile-config
39 +CLEANFILES=guile-config @target@-guile-config
40 +EXTRA_DIST=guile-config.in guile.m4 cross-guile-config.in
42 ## FIXME: in the future there will be direct automake support for
43 ## doing this. When that happens, switch over.
45 -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:
46 chmod +x guile-config.tmp
47 mv guile-config.tmp guile-config
53 +@target@-guile-config: cross-guile-config.in
55 + sed < ${srcdir}/$< > $<.tmp \
56 + -e s:@-SHELL-@:${SHELL}: \
57 + -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:\
58 + -e s:@-PREFIX-@:${prefix}: \
59 + -e "s:@-CPPFLAGS-@:${CPPFLAGS}:" \
60 + -e "s:@-LDFLAGS-@:${LDFLAGS}:"
64 ## Get rid of any copies of the configuration script under the old
65 ## name, so people don't end up running ancient copies of it.
66 diff -urN ../guile-1.4/guile-config/cross-guile-config.in ./guile-config/cross-guile-config.in
67 --- ../guile-1.4/guile-config/cross-guile-config.in Thu Jan 1 01:00:00 1970
68 +++ ./guile-config/cross-guile-config.in Mon Jun 5 15:13:58 2000
71 +# target-guile-config.in
74 + echo "@-GUILE_VERSION-@"
78 + echo "@-CPPFLAGS-@ -I @-PREFIX-@/include/guile"
82 + echo "-L @-PREFIX-@/lib -lguile @-LDFLAGS-@"