Fix small autoconf, automake, etc. issues

autoconf: check for C preprocessor and typeof extension
automake: Change headers to be noinst
Use return at end of main, not exit
sanity sanity don't run exec
blank test correctly order redirections

Signed-off-by: Aiden Woodruff <aiden.woodruff@gmail.com>

3 files changed, 16 insertions, 64 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index e308a9f..3a59f50 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
 bin_PROGRAMS = life
 life_SOURCES = life.c cmdline-life.c updatemap.c menus.c
 life_CFLAGS = -Wall -pedantic
-include_HEADERS = life.h updatemap.h menus.h cmdline-life.h life-macros.h
+noinst_HEADERS = life.h updatemap.h menus.h cmdline-life.h life-macros.h
diff --git a/src/Makefile.in b/src/Makefile.in
index bd9200c..61cc02b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -93,13 +93,13 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
         $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"
+am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_life_OBJECTS = life-life.$(OBJEXT) life-cmdline-life.$(OBJEXT) \
         life-updatemap.$(OBJEXT) life-menus.$(OBJEXT)
@@ -146,34 +146,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-HEADERS = $(include_HEADERS)
+HEADERS = $(noinst_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -285,7 +258,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 life_SOURCES = life.c cmdline-life.c updatemap.c menus.c
 life_CFLAGS = -Wall -pedantic
-include_HEADERS = life.h updatemap.h menus.h cmdline-life.h life-macros.h
+noinst_HEADERS = life.h updatemap.h menus.h cmdline-life.h life-macros.h
 all: all-am
 
 .SUFFIXES:
@@ -446,27 +419,6 @@ life-menus.obj: menus.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='menus.c' object='life-menus.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(life_CFLAGS) $(CFLAGS) -c -o life-menus.obj `if test -f 'menus.c'; then $(CYGPATH_W) 'menus.c'; else $(CYGPATH_W) '$(srcdir)/menus.c'; fi`
-install-includeHEADERS: $(include_HEADERS)
-        @$(NORMAL_INSTALL)
-        @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-        if test -n "$$list"; then \
-          echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-          $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
-        fi; \
-        for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          echo "$$d$$p"; \
-        done | $(am__base_list) | \
-        while read files; do \
-          echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-          $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
-        done
-
-uninstall-includeHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-        dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
         $(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -554,7 +506,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-        for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
+        for dir in "$(DESTDIR)$(bindir)"; do \
           test -z "$$dir" || $(MKDIR_P) "$$dir"; \
         done
 install: install-am
@@ -609,7 +561,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-includeHEADERS
+install-data-am:
 
 install-dvi: install-dvi-am
 
@@ -654,7 +606,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS
+uninstall-am: uninstall-binPROGRAMS
 
 .MAKE: install-am install-strip
 
@@ -664,13 +616,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS
         distdir dvi dvi-am html html-am info info-am install \
         install-am install-binPROGRAMS install-data install-data-am \
         install-dvi install-dvi-am install-exec install-exec-am \
-        install-html install-html-am install-includeHEADERS \
-        install-info install-info-am install-man install-pdf \
-        install-pdf-am install-ps install-ps-am install-strip \
-        installcheck installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
-        uninstall-am uninstall-binPROGRAMS uninstall-includeHEADERS
+        install-html install-html-am install-info install-info-am \
+        install-man install-pdf install-pdf-am install-ps \
+        install-ps-am install-strip installcheck installcheck-am \
+        installdirs maintainer-clean maintainer-clean-generic \
+        mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+        ps ps-am tags tags-am uninstall uninstall-am \
+        uninstall-binPROGRAMS
 
 .PRECIOUS: Makefile
 
diff --git a/src/life.c b/src/life.c
index 61b61b4..7fa8a8c 100644
--- a/src/life.c
+++ b/src/life.c
@@ -261,5 +261,5 @@ int main (int argc, char * argv[]) {
   delwin(stdscr);
   free(map);
   map = NULL;
-  exit(EXIT_SUCCESS);
+  return 0;
 }