yugui	2009-01-17 21:20:00 +0900 (Sat, 17 Jan 2009)

  New Revision: 21634

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21634

  Log:
    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.

  Modified files:
    branches/ruby_1_9_1/configure.in
    branches/ruby_1_9_1/ext/readline/readline.c

Index: ruby_1_9_1/configure.in
===================================================================
--- ruby_1_9_1/configure.in	(revision 21633)
+++ ruby_1_9_1/configure.in	(revision 21634)
@@ -1400,6 +1400,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: ruby_1_9_1/ext/readline/readline.c
===================================================================
--- ruby_1_9_1/ext/readline/readline.c	(revision 21633)
+++ ruby_1_9_1/ext/readline/readline.c	(revision 21634)
@@ -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/