From 38f0cb2e8c79663b835b52fbd6ddd172ca4493f6 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Sat, 27 Jul 2002 20:49:32 +0000
Subject: [PATCH] Changed tests for joe editor

---
 configure    | 20 ++++++++++----------
 configure.in | 22 +++++++++++-----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/configure b/configure
index daf5af86..0c61b0e2 100755
--- a/configure
+++ b/configure
@@ -7792,7 +7792,7 @@ esac
 
 echo "$as_me:$LINENO: checking location of joe editor" >&5
 echo $ECHO_N "checking location of joe editor... $ECHO_C" >&6
-for joebin in /usr/bin /usr/local/bin NONE; do
+for joebin in /usr/bin /usr/local/bin /usr/pkg/bin NONE; do
 	if test "$joebin" = "NONE"; then
 		{ echo "$as_me:$LINENO: WARNING: not found" >&5
 echo "$as_me: WARNING: not found" >&2;}
@@ -7800,19 +7800,19 @@ echo "$as_me: WARNING: not found" >&2;}
 
 		echo "$as_me:$LINENO: result: $joebin" >&5
 echo "${ECHO_T}$joebin" >&6
-		echo "$as_me:$LINENO: checking location of joe rc files" >&5
+		break
+	fi
+done
+echo "$as_me:$LINENO: checking location of joe rc files" >&5
 echo $ECHO_N "checking location of joe rc files... $ECHO_C" >&6
-		for joelib in /etc/joe /usr/lib/joe /usr/local/etc/joe /usr/local/lib/joe NONE; do
-			if test "$joelib" = "NONE"; then
-				{ echo "$as_me:$LINENO: WARNING: not found" >&5
+for joelib in /etc/joe /usr/lib/joe /usr/local/etc/joe /usr/local/lib/joe /usr/pkg/lib /usr/pkg/etc NONE; do
+	if test "$joelib" = "NONE"; then
+		{ echo "$as_me:$LINENO: WARNING: not found" >&5
 echo "$as_me: WARNING: not found" >&2;}
-			elif test -f $joelib/joerc; then
+	elif test -f $joelib/joerc; then
 
-				echo "$as_me:$LINENO: result: $joelib" >&5
+		echo "$as_me:$LINENO: result: $joelib" >&5
 echo "${ECHO_T}$joelib" >&6
-				break
-			fi
-		done
 		break
 	fi
 done
diff --git a/configure.in b/configure.in
index 6cf4c06a..d2a95abd 100644
--- a/configure.in
+++ b/configure.in
@@ -196,22 +196,22 @@ AC_SUBST(LOG_COMPRESSEXT)
 dnl
 
 AC_MSG_CHECKING(location of joe editor)
-for joebin in /usr/bin /usr/local/bin NONE; do
+for joebin in /usr/bin /usr/local/bin /usr/pkg/bin NONE; do
 	if test "$joebin" = "NONE"; then
 		AC_MSG_WARN(not found)
 	elif test -x $joebin/joe; then
 		AC_SUBST(joebin)
 		AC_MSG_RESULT($joebin)
-		AC_MSG_CHECKING(location of joe rc files)
-		for joelib in /etc/joe /usr/lib/joe /usr/local/etc/joe /usr/local/lib/joe NONE; do
-			if test "$joelib" = "NONE"; then
-				AC_MSG_WARN(not found)
-			elif test -f $joelib/joerc; then
-				AC_SUBST(joelib)
-				AC_MSG_RESULT($joelib)
-				break
-			fi
-		done
+		break
+	fi
+done
+AC_MSG_CHECKING(location of joe rc files)
+for joelib in /etc/joe /usr/lib/joe /usr/local/etc/joe /usr/local/lib/joe /usr/pkg/lib /usr/pkg/etc NONE; do
+	if test "$joelib" = "NONE"; then
+		AC_MSG_WARN(not found)
+	elif test -f $joelib/joerc; then
+		AC_SUBST(joelib)
+		AC_MSG_RESULT($joelib)
 		break
 	fi
 done