diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/extmk.rb.in | 3 | ||||
| -rw-r--r-- | ext/tcltklib/depend | 1 | ||||
| -rw-r--r-- | ext/tcltklib/extconf.rb | 2 |
4 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Thu Aug 10 05:40:28 2000 WATANABE Hirofumi <eban@os.rim.or.jp> + + * ext/extmk.rb.in: $CPPFLAGS should be initialized. + + * ext/tcltklib/depend: add stubs.o. + + * ext/tcltklib/extconf.rb: use $CPPFLAGS instead of $CFLAGS. + Wed Aug 9 16:31:48 2000 Yukihiro Matsumoto <matz@ruby-lang.org> * eval.c (rb_callcc): thread status for continuations must be diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index 617753f379..b0cd861025 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -550,7 +550,8 @@ def extmake(target) ldir = "-L"+dir if dir end - $CFLAGS = idir || "" + $CFLAGS = "" + $CPPFLAGS = idir || "" $LDFLAGS = ldir || "" begin diff --git a/ext/tcltklib/depend b/ext/tcltklib/depend index e91f9dacbf..2cd9c400f7 100644 --- a/ext/tcltklib/depend +++ b/ext/tcltklib/depend @@ -1 +1,2 @@ tcltklib.o: tcltklib.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h +stubs.o: stubs.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb index acc75b8cbc..58f2708c79 100644 --- a/ext/tcltklib/extconf.rb +++ b/ext/tcltklib/extconf.rb @@ -50,6 +50,6 @@ if have_header("tcl.h") && have_header("tk.h") && "/usr/X11/lib", "/usr/X11R6/lib", "/usr/openwin/lib")) && find_tcl(tcllib, stubs) && find_tk(tklib, stubs) - $CFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs + $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs create_makefile("tcltklib") end |