Changeset 7ccc780


Ignore:
Timestamp:
Mar 6, 2007, 8:40:29 PM (14 years ago)
Author:
Nelson Elhage <nelhage@mit.edu>
Branches:
master, barnowl_perlaim, debian, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
Children:
e0410eb
Parents:
d08162a
git-author:
Nelson Elhage <nelhage@mit.edu> (03/06/07 20:40:19)
git-committer:
Nelson Elhage <nelhage@mit.edu> (03/06/07 20:40:29)
Message:
Making athstatic conditional on --enable-athstatic to ./configure
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Makefile.in

    rd08162a r7ccc780  
    1818INSTALL_PROGRAM=@INSTALL_PROGRAM@
    1919INSTALL_DATA=@INSTALL_DATA@
     20ATHSTATIC=@ATHSTATIC@
    2021
    2122BASE_SRCS=list.c message.c mainwin.c popwin.c zephyr.c messagelist.c \
     
    4445
    4546$(EXE): $(AUTOGEN) $(OBJS) owl.o libfaim
    46         ./athstatic $(CC) -o $(EXE) owl.o $(OBJS) $(LDFLAGS) $(LIBS)
     47        $(ATHSTATIC) $(CC) -o $(EXE) owl.o $(OBJS) $(LDFLAGS) $(LIBS)
    4748
    4849tester: $(AUTOGEN) $(OBJS) tester.o
    49         ./athstatic $(CC) -o tester tester.o $(OBJS) $(LDFLAGS) $(LIBS)
     50        $(ATHSTATIC) $(CC) -o tester tester.o $(OBJS) $(LDFLAGS) $(LIBS)
    5051
    5152test: tester
  • configure.in

    rdc2ad79 r7ccc780  
    5656AC_CHECK_LIB(zephyr, ZInitLocationInfo, AC_DEFINE([HAVE_LIBZEPHYR_ZINITLOCATIONINFO], [], [Have ZInitLocationInfo]),)
    5757
     58AC_ARG_ENABLE([athstatic], AS_HELP_STRING([--enable-athstatic],
     59                                          [Statically link libraries in /usr/athena/lib]),
     60                                          [ATHSTATIC=./athstatic],
     61                                          [ATHSTATIC=])
     62
    5863AC_CHECK_FUNCS(use_default_colors resizeterm des_string_to_key des_key_sched des_ecb_encrypt)
    5964
     
    106111AC_SUBST(XSUBPPDIR)
    107112AC_SUBST(XSUBPPFLAGS)
     113AC_SUBST(ATHSTATIC)
    108114
    109115AC_PROG_INSTALL
Note: See TracChangeset for help on using the changeset viewer.