Changeset 7ccc780

Timestamp:

Mar 6, 2007, 8:40:29 PM (17 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, 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:

• Makefile.in (modified) (2 diffs)
• configure.in (modified) (2 diffs)

Makefile.in

@@ -18 +18 @@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
+ATHSTATIC=@ATHSTATIC@
 
 BASE_SRCS=list.c message.c mainwin.c popwin.c zephyr.c messagelist.c \
@@ -44 +45 @@
 
 $(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

configure.in

@@ -56 +56 @@
 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)
 
@@ -106 +111 @@
 AC_SUBST(XSUBPPDIR)
 AC_SUBST(XSUBPPFLAGS)
+AC_SUBST(ATHSTATIC)
 
 AC_PROG_INSTALL