ruby-changes:10085
From: nobu <ko1@a...>
Date: Sat, 17 Jan 2009 19:20:20 +0900 (JST)
Subject: [ruby-changes:10085] Ruby:r21628 (trunk): * configure.in (darwin): get rid of strange settings issue of
nobu 2009-01-17 19:20:07 +0900 (Sat, 17 Jan 2009) New Revision: 21628 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21628 Log: * 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. Modified files: trunk/configure.in trunk/ext/readline/readline.c Index: configure.in =================================================================== --- configure.in (revision 21627) +++ configure.in (revision 21628) @@ -1418,6 +1418,14 @@ 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'} Index: ext/readline/readline.c =================================================================== --- ext/readline/readline.c (revision 21627) +++ ext/readline/readline.c (revision 21628) @@ -1176,7 +1176,7 @@ VALUE history, fcomp, ucomp, version; /* Allow conditional parsing of the ~/.inputrc file. */ - rl_readline_name = "Ruby"; + rl_readline_name = (char *)"Ruby"; using_history(); @@ -1287,7 +1287,7 @@ #else { HIST_ENTRY *entry = remove_history(0); - free(entry->line); + free((char *)entry->line); free(entry); } #endif -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/