diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 12:20:00 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 12:20:00 +0000 |
| commit | 90ea30a3e9902eb7fc918ea26e738cdfe011aefa (patch) | |
| tree | 838413c19b4a1a48e6d7c0352d1f30a0ab3015a9 /configure.in | |
| parent | 83a2a2ac54a71e1b2230536f40c3f21afde609bd (diff) | |
merges r21628 from trunk into ruby_1_9_1.
* configure.in (darwin): get rid of strange settings issue of
apple gcc port, which searches /usr/local/include always but
/usr/local/lib not.
* ext/readline/readline.c (Init_readline): suppress warnings with
libedit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.in b/configure.in index de740bab99..f548204d5c 100644 --- a/configure.in +++ b/configure.in @@ -1400,6 +1400,14 @@ if test "$with_dln_a_out" != yes; then darwin*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress -flat_namespace'} : ${LDFLAGS=""} : ${LIBPATHENV=DYLD_LIBRARY_PATH} + # /usr/local/include is always searched for + # some reason, but /usr/local/lib is not. + hdr=`find /usr/local/include -name \*.h -type f | sed 's:^/usr/local/include/::;q'` + if test -n "$hdr" && $CC -E -include "$hdr" -xc /dev/null | fgrep -q "$hdr"; then + $CC -print-search-dirs | grep -q '^libraries:.*:/usr/local/lib/*' || + echo " $LDFLAGS " | grep -q ' -L */usr/local/lib/* ' || + LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib" + fi rb_cv_dlopen=yes ;; aix*) if test "$GCC" = yes; then : ${LDSHARED='$(CC) -shared'} |