 +void job_handle_signal ( int signal )
 +#endif
  {
- 	
+ 
  	int status;
-diff -ur fish-1.23.1.org/proc.h fish-1.23.1/proc.h
---- fish-1.23.1.org/proc.h	2009-03-08 15:46:47.009961472 +0100
-+++ fish-1.23.1/proc.h	2009-10-21 13:25:18.947650560 +0200
-@@ -427,7 +427,9 @@
+diff --git a/proc.h b/proc.h
+index dd46bc0..3618956 100644
+--- a/proc.h
++++ b/proc.h
+@@ -427,7 +427,9 @@ int job_reap( int interactive );
     Signal handler for SIGCHLD. Mark any processes with relevant
     information.
  */

 # This adds markup to the code that results in a few extra compile
 # time checks on recent GCC versions. It helps stop a few common bugs.
 #
@@ -298,7 +305,13 @@
 	# bug has been verified to not exist on Linux using GCC 3.3.3.
 	#
 

diff --git a/configure.ac b/configure.ac
index 377ab5e..672d34b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,7 +105,7 @@ fi
 # tree and doesn't update CFLAGS.
 #
 
-for i in /usr/pkg /sw /opt /opt/local; do
+for i in /usr/pkg /sw /opt /opt/local /boot/common; do
 
 	AC_MSG_CHECKING([for $i/include include directory])
 	if test -d $i/include; then
@@ -119,7 +119,8 @@ for i in /usr/pkg /sw /opt /opt/local; do
 	AC_MSG_CHECKING([for $i/lib library directory])
 	if test -d $i/lib; then
 		AC_MSG_RESULT(yes)
