* another small guile-cvs build fix
@ 2002-10-10 13:41 Jan Nieuwenhuizen
2002-10-10 19:51 ` Marius Vollmer
0 siblings, 1 reply; 2+ messages in thread
From: Jan Nieuwenhuizen @ 2002-10-10 13:41 UTC (permalink / raw)
Below a fix for --srcdir builds.
BTW, guile doesn't build here unless I ./configure --with-threads.
This is due to the use of scm_i_thread_root in async.c and scmsigs.c,
which is not declared unless USE_THREADS is #defined, in combination
with gcc's -Werror option. This can be fixed by unconditinal
including threads.h in both .c files, but that may not be the peferred
way to fix this?
Greetings,
Jan.
libguile-ltdl/ChangeLog:
2002-10-10 Jan Nieuwenhuizen <janneke@gnu.org>
* upstream/Makefile.am: Bugfixes for --srcdir build.
Index: libguile-ltdl/upstream/Makefile.am
===================================================================
RCS file: /cvsroot/guile/guile/guile-core/libguile-ltdl/upstream/Makefile.am,v
retrieving revision 1.3
diff -p -u -r1.3 Makefile.am
--- libguile-ltdl/upstream/Makefile.am 9 Oct 2002 21:16:31 -0000 1.3
+++ libguile-ltdl/upstream/Makefile.am 10 Oct 2002 13:28:48 -0000
@@ -34,8 +34,8 @@ ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\
EXTRA_DIST := ltdl.h ltdl.c ltdl.h.diff ltdl.c.diff
BUILT_SOURCES := ltdl.h.diff ltdl.c.diff
-ltdl.h.diff: ltdl.h ../raw-ltdl.h
- cp ../raw-ltdl.h raw-ltdl.guilemod.h.tmp
+ltdl.h.diff: $(srcdir)/ltdl.h $(srcdir)/../raw-ltdl.h
+ cp $(srcdir)/../raw-ltdl.h raw-ltdl.guilemod.h.tmp
perl -pi \
-e 's/SCMLTXT/extern/go;' \
-e 's/SCMLTSTATIC //go;' \
@@ -43,11 +43,11 @@ ltdl.h.diff: ltdl.h ../raw-ltdl.h
-e 's/SCM_INSERTED_DLSYMLIST_STRUCT_DECL //go;' \
raw-ltdl.guilemod.h.tmp
mv raw-ltdl.guilemod.h.tmp raw-ltdl.guilemod.h
- diff -ru ltdl.h raw-ltdl.guilemod.h > ltdl.h.diff; \
+ diff -ru $(srcdir)/ltdl.h raw-ltdl.guilemod.h > ltdl.h.diff; \
test "$$?" -eq 1
-ltdl.c.diff: ltdl.c ../raw-ltdl.c
- cp ../raw-ltdl.c raw-ltdl.guilemod.c.tmp
+ltdl.c.diff: $(srcdir)/ltdl.c $(srcdir)/../raw-ltdl.c
+ cp $(srcdir)/../raw-ltdl.c raw-ltdl.guilemod.c.tmp
perl -pi \
-e 's/SCMLTXT/extern/go;' \
-e 's/SCMLTSTATIC //go;' \
@@ -55,7 +55,7 @@ ltdl.c.diff: ltdl.c ../raw-ltdl.c
-e 's/SCM_INSERTED_DLSYMLIST_STRUCT_DECL //go;' \
raw-ltdl.guilemod.c.tmp
mv raw-ltdl.guilemod.c.tmp raw-ltdl.guilemod.c
- diff -ru ltdl.c raw-ltdl.guilemod.c > ltdl.c.diff; \
+ diff -ru $(srcdir)/ltdl.c raw-ltdl.guilemod.c > ltdl.c.diff; \
test "$$?" -eq 1
CLEANFILES := \
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien | http://www.lilypond.org
_______________________________________________
Guile-devel mailing list
Guile-devel@gnu.org
http://mail.gnu.org/mailman/listinfo/guile-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: another small guile-cvs build fix
2002-10-10 13:41 another small guile-cvs build fix Jan Nieuwenhuizen
@ 2002-10-10 19:51 ` Marius Vollmer
0 siblings, 0 replies; 2+ messages in thread
From: Marius Vollmer @ 2002-10-10 19:51 UTC (permalink / raw)
Cc: guile-devel
Jan Nieuwenhuizen <janneke@gnu.org> writes:
> BTW, guile doesn't build here unless I ./configure --with-threads.
Right, I'm working on this.
I'm also working on fixing the --srcdir build issue.
--
GPG: D5D4E405 - 2F9B BCCC 8527 692A 04E3 331E FAF8 226A D5D4 E405
_______________________________________________
Guile-devel mailing list
Guile-devel@gnu.org
http://mail.gnu.org/mailman/listinfo/guile-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2002-10-10 19:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-10-10 13:41 another small guile-cvs build fix Jan Nieuwenhuizen
2002-10-10 19:51 ` Marius Vollmer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).