  LIBS_FISH_PAGER=$LIBS
  LIBS=$LIBS_COMMON
  
-@@ -568,7 +585,7 @@ LIBS="$LIBS_SHARED"
+@@ -568,7 +578,7 @@ LIBS="$LIBS_SHARED"
  if test x$local_gettext != xno; then
  	AC_SEARCH_LIBS( gettext, intl,,)
  fi

diff --git a/configure.ac fish-1.23.1-git/configure.ac
index 377ab5e..672d34b 100644
--- a/configure.ac
+++ fish-1.23.1-git/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)
-		LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/"
+		LDFLAGS="$LDFLAGS -L$i/lib/"
+		#LDFLAGS="$LDFLAGS -R$i/lib/"
 	else
 		AC_MSG_RESULT(no)
 	fi
@@ -142,6 +143,12 @@ AC_CONFIG_HEADERS(config.h)
 
 
 #

 LIBS_FISHD=$LIBS
 LIBS=$LIBS_COMMON
 
