--- ./configure.org	2010-01-19 21:47:17.000000000 +0900
+++ ./configure	2010-10-01 18:56:30.000000000 +0900
@@ -6848,7 +6848,7 @@
 $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
-if test "$have_x"; then
+if test "$have_x" == yes; then
 
 $as_echo "#define HAVE_X_WINDOWS 1" >>confdefs.h
 
--- ./liboctave/lo-specfun.cc.org	2009-05-25 15:04:59.000000000 +0900
+++ ./liboctave/lo-specfun.cc	2010-10-01 20:27:31.000000000 +0900
@@ -25,6 +25,12 @@
 #include <config.h>
 #endif
 
+#if !defined(_REENTRANT)
+#define _REENTRANT
+#endif
+#include <cmath>
+#undef _REENTRANT
+
 #include "Range.h"
 #include "CColVector.h"
 #include "CMatrix.h"
--- ./Makeconf.in.org	2010-01-19 20:13:14.000000000 +0900
+++ ./Makeconf.in	2010-10-01 18:51:10.000000000 +0900
@@ -153,7 +153,7 @@
 
 MAGICK_CONFIG = @MAGICK_CONFIG@
 MAGICK_INCFLAGS = $(shell $(MAGICK_CONFIG) --cppflags)
-MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --libs)
+MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --libs | sed 's|-lXext|-L/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/lib -lXext|')
 
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
--- ./scripts/plot/gnuplot_drawnow.m.org	2009-11-24 16:02:08.000000000 +0900
+++ ./scripts/plot/gnuplot_drawnow.m	2010-10-01 18:46:41.000000000 +0900
@@ -350,9 +350,10 @@
   term = getenv ("GNUTERM");
   ## If not specified, guess the terminal type.
   if (isempty (term))
-    if (ismac ())
-      term = "aqua";
-    elseif (! isunix ())
+    #if (ismac ())
+    #  term = "aqua";
+    #elseif (! isunix ())
+    if (! isunix ())
       term = "windows";
     elseif (! isempty (getenv ("DISPLAY")))
       term = "x11";