[351] in BarnOwl Developers
[D-O-H] r496 - in trunk: . owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:05:13 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Mon, 8 Jan 2007 17:08:56 -0500 (EST)
Author: nelhage
Date: 2007-01-08 17:08:55 -0500 (Mon, 08 Jan 2007)
New Revision: 496
Modified:
trunk/
trunk/owl/Makefile.in
trunk/owl/configure
trunk/owl/configure.in
Log:
r17874@phanatique: nelhage | 2007-01-08 17:08:46 -0500
Actually doing the XSUBPP fix.
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17872
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17874
Modified: trunk/owl/Makefile.in
===================================================================
--- trunk/owl/Makefile.in 2007-01-08 22:03:05 UTC (rev 495)
+++ trunk/owl/Makefile.in 2007-01-08 22:08:55 UTC (rev 496)
@@ -12,6 +12,7 @@
LIBS=@LIBS@ -L./libfaim -lfaim
CFLAGS=@CFLAGS@ -I. -I./libfaim -DDATADIR=\"${datadir}\"
LDFLAGS=@LDFLAGS@
+XSUBPPDIR=@XSUBPPDIR@
XSUBPPFLAGS=@XSUBPPFLAGS@
INSTALL=@INSTALL@
INSTALL_PROGRAM=@INSTALL_PROGRAM@
@@ -57,7 +58,7 @@
proto: owl_prototypes.h
perlglue.c: perlglue.xs
- perl $(XSUBPPDIR)/xsubpp -prototypes perlglue.xs > perlglue.c
+ perl $(XSUBPPDIR)/xsubpp $(XSUBPPFLAGS) -prototypes perlglue.xs > perlglue.c
varstubs.c: variable.c stubgen.pl
perl stubgen.pl > varstubs.c
Modified: trunk/owl/configure
===================================================================
--- trunk/owl/configure 2007-01-08 22:03:05 UTC (rev 495)
+++ trunk/owl/configure 2007-01-08 22:08:55 UTC (rev 496)
@@ -645,6 +645,7 @@
CPP
GREP
EGREP
+XSUBPPDIR
XSUBPPFLAGS
INSTALL_PROGRAM
INSTALL_SCRIPT
@@ -5058,6 +5059,7 @@
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -5825,6 +5827,7 @@
CPP!$CPP$ac_delim
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
+XSUBPPDIR!$XSUBPPDIR$ac_delim
XSUBPPFLAGS!$XSUBPPFLAGS$ac_delim
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
@@ -5834,7 +5837,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: trunk/owl/configure.in
===================================================================
--- trunk/owl/configure.in 2007-01-08 22:03:05 UTC (rev 495)
+++ trunk/owl/configure.in 2007-01-08 22:08:55 UTC (rev 496)
@@ -103,6 +103,7 @@
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)
AC_PROG_INSTALL
