From 0b1287649ea6893614d32cba44bd8430758f9ae4 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Mon, 18 Nov 2019 20:51:14 -0500
Subject: [PATCH 4/4] Use ast from MacPorts

---
 ds9/macos/Makefile.in |  6 +++---
 ds9/unix/Makefile.in  |  6 +++---
 make.include          | 49 +------------------------------------------
 3 files changed, 7 insertions(+), 54 deletions(-)

diff --git a/ds9/macos/Makefile.in b/ds9/macos/Makefile.in
index c7043054..f1fb472c 100644
--- a/ds9/macos/Makefile.in
+++ b/ds9/macos/Makefile.in
@@ -105,9 +105,6 @@ SPECS	= \
 
 LLIBS	= \
 	$(libdir)/libfuntools.a \
-	$(libdir)/libast.a \
-	$(libdir)/libast_err.a \
-	$(libdir)/libast_pal.a \
 	$(libdir)/libxpa.a \
 	$(subst /$(space),/,$(patsubst -L%,%/,$(patsubst -l%,lib%.a,$(SPECS))))
 
@@ -174,6 +171,9 @@ ds9base	: $(OBJS) $(LLIBS)
 	$(RM) $@
 	$(CC) $(CFLAGS) -o $@ \
 	$(OBJS) \
+	-last \
+	-last_err \
+	-last_pal \
 	$(LLIBS) \
 	-L @macports_prefix@/lib/openssl-1.0 -lssl -lcrypto \
 	$(TK_LIB_SPEC) \
diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in
index f66ff675..9867d0ec 100644
--- a/ds9/unix/Makefile.in
+++ b/ds9/unix/Makefile.in
@@ -105,9 +105,6 @@ SPECS	= \
 LLIBS	= \
 	$(subst /$(space),/,$(patsubst -L%,%/,$(patsubst -l%,lib%.a,$(tksao_LIB_SPEC)))) \
 	$(libdir)/libfuntools.a \
-	$(libdir)/libast.a \
-	$(libdir)/libast_err.a \
-	$(libdir)/libast_pal.a \
 	$(libdir)/libxpa.a \
 	$(subst /$(space),/,$(patsubst -L%,%/,$(patsubst -l%,lib%.a,$(SPECS))))
 
@@ -175,6 +172,9 @@ ds9base	: $(OBJS) $(LLIBS)
 	$(RM) $@
 	$(CC) $(CFLAGS) -o $@ \
 	$(OBJS) \
+	-last \
+	-last_err \
+	-last_pal \
 	$(LLIBS) \
 	-L @macports_prefix@/lib/openssl-1.0 -lssl -lcrypto \
 	$(TK_LIBS) \
diff --git a/make.include b/make.include
index f45619c1..4490edfe 100644
--- a/make.include
+++ b/make.include
@@ -306,54 +306,7 @@ tksao/Makefile :
 
 #-------------------------- ast
 
-ast	: ast/Makefile ast/ast.h ast/.libs/libast.a ast/.libs/libast_err.a ast/.libs/libast_pal.a
-
-ast/Makefile :
-	@echo ""
-	@echo "*** $@ ***"
-	cd ast; \
-	./configure \
-	$(ASTFLAGS) \
-	--without-pthreads --enable-shared=no \
-	star_cv_cnf_trail_type=long star_cv_cnf_f2c_compatible=no \
-	$(CONFIGFLAGS) \
-	$(PREFIX) \
-	--disable-shared
-	cd ast; touch configure.ac aclocal.m4 configure Makefile.am Makefile.in
-
-ast/ast.h :
-	@echo ""
-	@echo "*** $@ ***"
-	$(MAKE) -C ast -j ast.h
-	$(MAKE) -C ast -j $(JOBS) libast.la
-	$(MAKE) -C ast -j $(JOBS) libast_err.la
-	$(MAKE) -C ast -j $(JOBS) libast_pal.la
-	cp ast/ast.h $(includedir)/.
-	cp ast/grf.h $(includedir)/.
-	cp ast/grf3d.h $(includedir)/.
-	cp ast/.libs/libast.a $(libdir)/.
-	cp ast/.libs/libast_err.a $(libdir)/.
-	cp ast/.libs/libast_pal.a $(libdir)/.
-
-ast/.libs/libast.a :
-	@echo ""
-	@echo "*** $@ ***"
-	$(MAKE) -C ast -j ast.h
-	cp ast/ast.h $(includedir)/.
-	cp ast/grf.h $(includedir)/.
-	cp ast/grf3d.h $(includedir)/.
-
-ast/.libs/libast_err.a :
-	@echo ""
-	@echo "*** $@ ***"
-	$(MAKE) -C ast -j $(JOBS) libast_err.la
-	cp ast/.libs/libast_err.a $(libdir)/.
-
-ast/.libs/libast_pal.a :
-	@echo ""
-	@echo "*** $@ ***"
-	$(MAKE) -C ast -j $(JOBS) libast_pal.la
-	cp ast/.libs/libast_pal.a $(libdir)/.
+ast	:
 
 #-------------------------- funtools
 
-- 
2.24.0