[702] in BarnOwl Developers
[D-O-H] r760 - trunk/owl
daemon@ATHENA.MIT.EDU (ecprice@MIT.EDU)
Thu Oct 29 18:08:50 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: ecprice@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Date: Sat, 08 Sep 2007 17:33:41 -0400
Author: ecprice
Date: 2007-09-08 17:33:34 -0400 (Sat, 08 Sep 2007)
New Revision: 760
Modified:
trunk/owl/configure.in
trunk/owl/owl.c
trunk/owl/owl.h
Log:
Fixes for FreeBSD.
Modified: trunk/owl/configure.in
===================================================================
--- trunk/owl/configure.in 2007-09-07 04:13:45 UTC (rev 759)
+++ trunk/owl/configure.in 2007-09-08 21:33:34 UTC (rev 760)
@@ -30,11 +30,15 @@
fi
dnl Check for kerberosIV include
-AC_MSG_CHECKING(for /usr/include/kerberosIV)
+AC_MSG_CHECKING(for kerberosIV)
if test -d /usr/include/kerberosIV; then
CFLAGS=${CFLAGS}\ -I/usr/include/kerberosIV
CPPFLAGS=${CPPFLAGS}\ -I/usr/include/kerberosIV
AC_MSG_RESULT(yes)
+elif test -d /usr/local/include/kerberosIV; then
+ CFLAGS=${CFLAGS}\ -I/usr/local/include/kerberosIV
+ CPPFLAGS=${CPPFLAGS}\ -I/usr/local/include/kerberosIV
+ AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
@@ -99,15 +103,12 @@
XSUBPPFLAGS=""
fi
-dnl Add LDFLAGS for embeded perl
+dnl Add LDFLAGS for embedded perl
FOO=`perl -MExtUtils::Embed -e ldopts`
echo Adding perl LDFLAGS ${FOO}
LDFLAGS=${LDFLAGS}\ ${FOO}
dnl Checks for typedefs, structures, and compiler characteristics.
-AC_CHECK_FILE(/usr/share/terminfo, AC_DEFINE(TERMINFO, "/usr/share/terminfo", [Have terminfo]),
- AC_CHECK_FILE(/usr/share/lib/terminfo, AC_DEFINE(TERMINFO, "/usr/share/lib/terminfo", [Have terminfo]),
- AC_MSG_ERROR(No terminfo found for this system)))
AC_SUBST(XSUBPPDIR)
AC_SUBST(XSUBPPFLAGS)
Modified: trunk/owl/owl.c
===================================================================
--- trunk/owl/owl.c 2007-09-07 04:13:45 UTC (rev 759)
+++ trunk/owl/owl.c 2007-09-08 21:33:34 UTC (rev 760)
@@ -176,9 +176,7 @@
/* screen init */
if (!getenv("TERMINFO")) {
- sprintf(buff, "TERMINFO=%s", TERMINFO);
- putenv(buff);
- owl_function_debugmsg("startup: setting TERMINFO to %s", TERMINFO);
+ owl_function_debugmsg("startup: Not setting TERMINFO");
} else {
owl_function_debugmsg("startup: leaving TERMINFO as %s from envrionment", getenv("TERMINFO"));
}
Modified: trunk/owl/owl.h
===================================================================
--- trunk/owl/owl.h 2007-09-07 04:13:45 UTC (rev 759)
+++ trunk/owl/owl.h 2007-09-08 21:33:34 UTC (rev 760)
@@ -62,7 +62,10 @@
/* Perl and curses don't play nice. */
#ifdef OWL_PERL
typedef void WINDOW;
+/* logout is defined in FreeBSD. */
+#define logout logout_
#include <perl.h>
+#undef logout
#include "XSUB.h"
#else
typedef void SV;
