From 9f286540c52bf5a01df18bbd6f47f073dba6520b Mon Sep 17 00:00:00 2001
From: Dustin Lang <dstndstn@gmail.com>
Date: Thu, 16 Jul 2020 16:26:35 -0400
Subject: [PATCH] fix test_qsort_r; remove redundant TEST_NETPBM and
 TEST_NETPBM_MAKE

---
 include/astrometry/os-features.h | 2 --
 util/Makefile                    | 5 ++---
 util/os-features-test.c          | 3 +--
 util/test_qsort_r.c              | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/astrometry/os-features.h b/include/astrometry/os-features.h
index 176b8d320..6b73a7d83 100644
--- a/include/astrometry/os-features.h
+++ b/include/astrometry/os-features.h
@@ -5,9 +5,7 @@
 #ifndef OS_FEATURES_H
 #define OS_FEATURES_H
 
-#ifndef DONT_INCLUDE_OS_FEATURES_CONFIG_H
 #include "astrometry/os-features-config.h"
-#endif
 
 // Features we use that aren't standard across all supported platforms
 
diff --git a/util/Makefile b/util/Makefile
index faf37de18..34c46287c 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -295,8 +295,8 @@ makefile.os-features: os-features-test.c
 	( \
 	 echo "# This file is generated by util/Makefile."; \
 	 (($(CC) -o os-features-test-netpbm-make \
-	   $(CPPFLAGS) $(CFLAGS) -DTEST_NETPBM_MAKE $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features-makefile.log && \
-	   ./os-features-test-netpbm-make >> os-features-makefile.log && \
+	   $(CPPFLAGS) $(CFLAGS) -DTEST_NETPBM $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features-makefile.log && \
+	   ./os-features-test-netpbm >> os-features-makefile.log && \
 	   echo "HAVE_NETPBM := yes") \
 	|| (echo "# Astrometry.net didn't find netpbm; not setting HAVE_NETPBM."; \
 		echo "# See os-features-makefile.log for details."; \
@@ -333,7 +333,6 @@ config: $(INCLUDE_DIR)/os-features-config.h makefile.os-features
 
 ALL_TARGETS := os-features-test.o \
 	os-features-test-netpbm \
-	os-features-test-netpbm-make \
 	$(INCLUDE_DIR)/os-features-config.h
 
 ifndef NO_QFITS
diff --git a/util/os-features-test.c b/util/os-features-test.c
index 51d533c3a..83626717d 100644
--- a/util/os-features-test.c
+++ b/util/os-features-test.c
@@ -5,12 +5,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#if defined(TEST_NETPBM) || defined(TEST_NETPBM_MAKE)
+#if defined(TEST_NETPBM)
 #include <pam.h>
 int main(int argc, char** args) {
     struct pam img;
     pm_init(args[0], 0);
-    //printf("#define HAVE_NETPBM 1\n");
     img.size = 42;
     printf("the answer is %i\n", img.size);
     return 0;
diff --git a/util/test_qsort_r.c b/util/test_qsort_r.c
index e33cdcd9c..2c687044a 100644
--- a/util/test_qsort_r.c
+++ b/util/test_qsort_r.c
@@ -9,7 +9,7 @@
 
 #include "cutest.h"
 
-#include "os-features.h"
+#include "ioutils.h"
 
 char* true_baton_val = "MYBATON";