summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-31 15:20:59 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-31 15:20:59 +0000
commit311352fe93d667102f2fe7460c8ede03f4dde908 (patch)
tree793d0675a95eb93606d90d18f6d7dd8bf3ed0f58
parent2a7b019a2dd498af081e49823da81d38f6300896 (diff)
* configure.in (aix): fix linker flags on AIX. [ruby-talk:125460]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog12
-rw-r--r--configure.in7
2 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d6b390d25..ff7a6d4d81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 1 00:20:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (aix): fix linker flags on AIX. [ruby-talk:125460]
+
Mon Jan 31 13:33:21 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c: add invalid namespace check
@@ -64,7 +68,7 @@ Tue Jan 25 14:05:52 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/menu.rb: bug on treating arguments [ruby-dev:25479]
- * ext/tk/lib/tk.rb: bug fix; cannot accept a callback ID string for
+ * ext/tk/lib/tk.rb: bug fix; cannot accept a callback ID string for
a command argument [ruby-dev:25479]
* ext/tk/lib/multi-tk.rb: ditto
@@ -92,7 +96,7 @@ Sun Jan 23 12:41:16 2005 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
a method having uncapitalized name. (converted with
GenSupport.safemethodname to handle operation name 'foo-bar'). it
introduced serious incompatibility; in the past, it was defined as a
- capitalized.
+ capitalized.
define capitalized method as well under that circumstance.
@@ -169,10 +173,10 @@ Wed Jan 19 01:16:30 2005 Tanaka Akira <akr@m17n.org>
Tue Jan 18 15:03:05 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
+ * lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
of :SSLEnable is false.
- * lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
+ * lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
don't allow changing its mode.
* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
diff --git a/configure.in b/configure.in
index 31356353fa..d0efd7feb4 100644
--- a/configure.in
+++ b/configure.in
@@ -894,11 +894,10 @@ if test "$with_dln_a_out" != yes; then
rb_cv_dlopen=yes ;;
aix*) : ${LDSHARED='/usr/ccs/bin/ld'}
XLDFLAGS="$XLDFLAGS -Wl,-bE:ruby.imp"
- DLDFLAGS='-brtl -bI:$(topdir)/ruby.imp -bM:SRE -T512 -H512 '"$DLDFLAGS"
- ARCH_FLAG='-eInit_$(TARGET)'
- : LDFLAGS="-brtl $LDFLAGS"
+ DLDFLAGS='-brtl -eInit_$(TARGET) -bI:$(topdir)/ruby.imp -bM:SRE -T512 -H512 '"$DLDFLAGS"
+ LDFLAGS="-brtl $LDFLAGS"
: ${ARCHFILE="ruby.imp"}
- TRY_LINK='$(CC) $(DLDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS) $(CFLAGS)'
+ TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS) $(CFLAGS)'
TRY_LINK="$TRY_LINK"' $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
rb_cv_dlopen=yes ;;