[538] in BarnOwl Developers
[D-O-H] r656 - in trunk: . owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:07:12 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: Tue, 6 Mar 2007 20:40:29 -0500 (EST)
Author: nelhage
Date: 2007-03-06 20:40:29 -0500 (Tue, 06 Mar 2007)
New Revision: 656
Modified:
trunk/
trunk/owl/Makefile.in
trunk/owl/configure.in
Log:
r19378@phanatique: nelhage | 2007-03-06 20:40:19 -0500
Making athstatic conditional on --enable-athstatic to ./configure
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:19375
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:19378
Modified: trunk/owl/Makefile.in
===================================================================
--- trunk/owl/Makefile.in 2007-03-07 00:34:15 UTC (rev 655)
+++ trunk/owl/Makefile.in 2007-03-07 01:40:29 UTC (rev 656)
@@ -17,6 +17,7 @@
INSTALL=@INSTALL@
INSTALL_PROGRAM=@INSTALL_PROGRAM@
INSTALL_DATA=@INSTALL_DATA@
+ATHSTATIC=@ATHSTATIC@
BASE_SRCS=list.c message.c mainwin.c popwin.c zephyr.c messagelist.c \
commands.c global.c text.c fmtext.c editwin.c util.c logging.c \
@@ -43,10 +44,10 @@
$(EXE): $(AUTOGEN) $(OBJS) owl.o libfaim
- ./athstatic $(CC) -o $(EXE) owl.o $(OBJS) $(LDFLAGS) $(LIBS)
+ $(ATHSTATIC) $(CC) -o $(EXE) owl.o $(OBJS) $(LDFLAGS) $(LIBS)
tester: $(AUTOGEN) $(OBJS) tester.o
- ./athstatic $(CC) -o tester tester.o $(OBJS) $(LDFLAGS) $(LIBS)
+ $(ATHSTATIC) $(CC) -o tester tester.o $(OBJS) $(LDFLAGS) $(LIBS)
test: tester
./tester reg
Modified: trunk/owl/configure.in
===================================================================
--- trunk/owl/configure.in 2007-03-07 00:34:15 UTC (rev 655)
+++ trunk/owl/configure.in 2007-03-07 01:40:29 UTC (rev 656)
@@ -55,6 +55,11 @@
AC_CHECK_LIB(zephyr, ZGetSender)
AC_CHECK_LIB(zephyr, ZInitLocationInfo, AC_DEFINE([HAVE_LIBZEPHYR_ZINITLOCATIONINFO], [], [Have ZInitLocationInfo]),)
+AC_ARG_ENABLE([athstatic], AS_HELP_STRING([--enable-athstatic],
+ [Statically link libraries in /usr/athena/lib]),
+ [ATHSTATIC=./athstatic],
+ [ATHSTATIC=])
+
AC_CHECK_FUNCS(use_default_colors resizeterm des_string_to_key des_key_sched des_ecb_encrypt)
AC_MSG_CHECKING(for des_ecb_encrypt prototype)
@@ -105,6 +110,7 @@
AC_SUBST(XSUBPPDIR)
AC_SUBST(XSUBPPFLAGS)
+AC_SUBST(ATHSTATIC)
AC_PROG_INSTALL
