$OpenBSD: patch-acinclude_m4,v 1.1 2011/06/24 08:42:31 dcoppa Exp $
--- acinclude.m4.orig	Fri Jun 17 14:46:26 2011
+++ acinclude.m4	Fri Jun 17 15:11:57 2011
@@ -82,8 +82,8 @@ AC_DEFUN([MULE_CHECK_SYSTEM],
 		;;
 	openbsd*) 
 		SYS=openbsd
-		LIBS="$LIBS -L/usr/local/lib"
-		X11LIBS="-lX11 -L/usr/X11R6/lib"
+		LIBS="$LIBS -L${LOCALDIR}/lib"
+		X11LIBS="-lX11 -L${X11R6DIR}/lib"
 		MULECPPFLAGS="-D__OPENBSD__"
 		;;
 	*cygwin* | *mingw32*)
@@ -113,11 +113,11 @@ AC_DEFUN([MULE_CHECK_SYSTEM],
 		;;
 	esac
 
-	# -lpthread is needed by Debian but FreeBSD < 5 doesn't support it
+	# -lpthread is needed by Debian but OpenBSD doesn't support it
 	AS_IF([test ${SYS:-unknown} != win32],
 	[
-		AC_MSG_CHECKING([if this is a FreeBSD 4 or earlier system])
-		AS_IF([test x"`uname -s`" = xFreeBSD && test 0`uname -r | cut -c 1` -lt 5],
+		AC_MSG_CHECKING([if this is an OpenBSD system])
+		AS_IF([test x"`uname -s`" = xOpenBSD],
 		[
 			MULE_ADDFLAG([LD], [-pthread])
 			AC_MSG_RESULT(yes)
@@ -359,7 +359,7 @@ AC_DEFUN([MULE_CHECK_FLEX_EXTENDED],
 [
 	AC_MSG_CHECKING([for extended flex capabilities])
 
-	extended_flex=`flex --help | grep header-file`
+	extended_flex=`${LEX} --help | grep header-file`
 	AS_IF([test -n "$extended_flex"], [HAVE_FLEX_EXTENDED=yes], [HAVE_FLEX_EXTENDED=no])
 	AC_MSG_RESULT($HAVE_FLEX_EXTENDED)
 
