diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-02 16:21:26 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-02 16:21:26 +0000 |
commit | 59dbfa3e4cc8d4705ef5a4abd9904fa523f26bfa (patch) | |
tree | dceea3234a395183be7e17858fbbf80ef291e984 /ext/socket | |
parent | 88c127c19be3d12bc5edcb6ceb416985258396c6 (diff) | |
download | ruby-59dbfa3e4cc8d4705ef5a4abd9904fa523f26bfa.tar.gz |
* dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>.
[ruby-dev:22476]
* io.c (argf_eof): ARGF.eof? should not have any side effect.
[ruby-dev:22469]
* io.c (argf_each_byte): should return self. [ruby-dev:22465]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
-rw-r--r-- | ext/socket/extconf.rb | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 4f7b49407f..acbff10a16 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -35,7 +35,7 @@ main() socket(AF_INET6, SOCK_STREAM, 0); } EOF - $CFLAGS+=" -DENABLE_IPV6" + $CPPFLAGS+=" -DENABLE_IPV6" $ipv6 = true end end @@ -49,7 +49,7 @@ if $ipv6 #include <netinet/in.h> EOF $ipv6type = "inria" - $CFLAGS="-DINET6 "+$CFLAGS + $CPPFLAGS="-DINET6 "+$CPPFLAGS elsif macro_defined?("__KAME__", <<EOF) #include <netinet/in.h> EOF @@ -57,37 +57,38 @@ EOF $ipv6lib="inet6" $ipv6libdir="/usr/local/v6/lib" $ipv6trylibc=true - $CFLAGS="-DINET6 "+$CFLAGS + $CPPFLAGS="-DINET6 "+$CPPFLAGS elsif File.directory? "/usr/inet6" $ipv6type = "linux" $ipv6lib="inet6" $ipv6libdir="/usr/inet6/lib" - $CFLAGS="-DINET6 -I/usr/inet6/include "+$CFLAGS + $CPPFLAGS="-DINET6 -I/usr/inet6/include "+$CPPFLAGS elsif macro_defined?("_TOSHIBA_INET6", <<EOF) #include <sys/param.h> EOF $ipv6type = "toshiba" $ipv6lib="inet6" $ipv6libdir="/usr/local/v6/lib" - $CFLAGS="-DINET6 "+$CFLAGS + $CPPFLAGS="-DINET6 "+$CPPFLAGS elsif macro_defined?("__V6D__", <<EOF) #include </usr/local/v6/include/sys/v6config.h> EOF $ipv6type = "v6d" $ipv6lib="v6" $ipv6libdir="/usr/local/v6/lib" - $CFLAGS="-DINET6 -I/usr/local/v6/include "+$CFLAGS + $CFLAGS="-I/usr/local/v6/include "+$CFLAGS + $CPPFLAGS="-DINET6 "+$CPPFLAGS elsif macro_defined?("_ZETA_MINAMI_INET6", <<EOF) #include <sys/param.h> EOF $ipv6type = "zeta" $ipv6lib="inet6" $ipv6libdir="/usr/local/v6/lib" - $CFLAGS="-DINET6 "+$CFLAGS + $CPPFLAGS="-DINET6 "+$CPPFLAGS else $ipv6lib=with_config("ipv6-lib", nil) $ipv6libdir=with_config("ipv6-libdir", nil) - $CFLAGS="-DINET6 "+$CFLAGS + $CPPFLAGS="-DINET6 "+$CPPFLAGS end if $ipv6lib @@ -147,7 +148,7 @@ main() return 0; } EOF - $CFLAGS="-DHAVE_SOCKADDR_STORAGE "+$CFLAGS + $CPPFLAGS="-DHAVE_SOCKADDR_STORAGE "+$CPPFLAGS else # doug's fix, NOW add -Dss_family... only if required! $CPPFLAGS += " -Dss_family=__ss_family -Dss_len=__ss_len" if try_link(<<EOF) @@ -304,9 +305,9 @@ end case with_config("lookup-order-hack", "UNSPEC") when "INET" - $CFLAGS="-DLOOKUP_ORDER_HACK_INET "+$CFLAGS + $CPPFLAGS="-DLOOKUP_ORDER_HACK_INET "+$CPPFLAGS when "INET6" - $CFLAGS="-DLOOKUP_ORDER_HACK_INET6 "+$CFLAGS + $CPPFLAGS="-DLOOKUP_ORDER_HACK_INET6 "+$CPPFLAGS when "UNSPEC" # nothing special else @@ -351,7 +352,7 @@ EOF end if have_getaddrinfo - $CFLAGS="-DHAVE_GETADDRINFO "+$CFLAGS + $CPPFLAGS="-DHAVE_GETADDRINFO "+$CPPFLAGS else $CFLAGS="-I. "+$CFLAGS $objs += ["getaddrinfo.#{$OBJEXT}"] |