nobu	2009-02-05 21:01:25 +0900 (Thu, 05 Feb 2009)

  New Revision: 22079

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

  Log:
    merged revision 21628:
    * 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_8/ChangeLog
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/ext/readline/readline.c

Index: ruby_1_8/ext/readline/readline.c
===================================================================
--- ruby_1_8/ext/readline/readline.c	(revision 22078)
+++ ruby_1_8/ext/readline/readline.c	(revision 22079)
@@ -750,7 +750,7 @@
     VALUE history, fcomp, ucomp;
 
     /* Allow conditional parsing of the ~/.inputrc file. */
-    rl_readline_name = "Ruby";
+    rl_readline_name = (char *)"Ruby";
 
     using_history();
 
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 22078)
+++ ruby_1_8/configure.in	(revision 22079)
@@ -1247,6 +1247,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_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 22078)
+++ ruby_1_8/ChangeLog	(revision 22079)
@@ -1,3 +1,12 @@
+Thu Feb  5 21:01:24 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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.
+
 Tue Feb  3 18:35:48 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/thread/thread.c (rb_queue_pop, rb_queue_push): should not lock

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/