Clean up the maekfile a bit sicne we aren't using config.h anyway.

Makefile.in

@@ -110,7 +110,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
@@ -408,7 +407,7 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
+DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -457,9 +456,8 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 AM_RECURSIVE_TARGETS = cscope
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/src/config.h.in \
+am__DIST_COMMON = $(srcdir)/Makefile.in COPYING TODO compile \
-	COPYING TODO compile config.guess config.sub depcomp \
+	config.guess config.sub depcomp install-sh missing
-	install-sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -491,7 +489,6 @@ BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
@@ -502,9 +499,7 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -742,21 +737,6 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
-
-src/config.h: src/stamp-h1
-	@test -f $@ || rm -f src/stamp-h1
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) src/stamp-h1
-
-src/stamp-h1: $(top_srcdir)/src/config.h.in $(top_builddir)/config.status
-	@rm -f src/stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status src/config.h
-$(top_srcdir)/src/config.h.in:  $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f src/stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f src/config.h src/stamp-h1
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -4284,7 +4264,7 @@ distclean: distclean-am
 	-rm -rf ./src/$(DEPDIR) ./src/cli/$(DEPDIR) ./src/data/$(DEPDIR) ./src/data/action/$(DEPDIR) ./src/data/field/$(DEPDIR) ./src/data/format/$(DEPDIR) ./src/gfx/$(DEPDIR) ./src/gui/$(DEPDIR) ./src/gui/control/$(DEPDIR) ./src/gui/set/$(DEPDIR) ./src/gui/symbol/$(DEPDIR) ./src/gui/value/$(DEPDIR) ./src/render/card/$(DEPDIR) ./src/render/symbol/$(DEPDIR) ./src/render/text/$(DEPDIR) ./src/render/value/$(DEPDIR) ./src/script/$(DEPDIR) ./src/script/functions/$(DEPDIR) ./src/util/$(DEPDIR) ./src/util/io/$(DEPDIR) ./src/util/vcs/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -4354,17 +4334,16 @@ uninstall-am: uninstall-binPROGRAMS
 	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
 	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
 	distcheck distclean distclean-compile distclean-generic \
-	distclean-hdr distclean-tags distcleancheck distdir \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
+	dvi-am html html-am info info-am install install-am \
-	install install-am install-binPROGRAMS install-data \
+	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-data-am install-dvi install-dvi-am install-exec \
+	install-dvi-am install-exec install-exec-am install-html \
-	install-exec-am install-html install-html-am install-info \
+	install-html-am install-info install-info-am install-man \
-	install-info-am install-man install-pdf install-pdf-am \
+	install-pdf install-pdf-am install-ps install-ps-am \
-	install-ps install-ps-am install-strip installcheck \
+	install-strip installcheck installcheck-am installdirs \
-	installcheck-am installdirs maintainer-clean \
+	maintainer-clean maintainer-clean-generic mostlyclean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
-	uninstall-am uninstall-binPROGRAMS
 
 .PRECIOUS: Makefile
 

configure.ac

@@ -10,8 +10,6 @@ AC_INIT(magicseteditor, 0.3.9, twanvl@users.sourceforge.net)
 AC_CANONICAL_SYSTEM
 
 AC_CONFIG_SRCDIR([src/main.cpp])
-# TODO: Actually use the config header
-AC_CONFIG_HEADER([src/config.h])
 
 AM_INIT_AUTOMAKE([foreign])
 
@@ -38,10 +36,6 @@ case "${host_os}" in
     ;;
 esac
 
-
-if test -n "${CXXFLAGS}"; then
-  user_set_cxxflags=yes
-fi
 CXXFLAGS="${CXXFLAGS} ${DEFAULT_CXXFLAGS} -std=gnu++98 -DBOOST_USE_WINDOWS_H"
 LDFLAGS="${LDFLAGS} ${DEFAULT_LDFLAGS}"
 
@@ -77,18 +71,6 @@ AC_ARG_ENABLE(pch, [--enable-pch  Enable precompiled headers (Requires
 # TODO: Deal with braindead GCC and actually check
 AM_CONDITIONAL(GLIBCPP_BUILD_PCH, test "x$enable_pch" = "xyes" -a "x$CXX" = "xg++")
 
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
-
-# Checks for library functions.
-AC_HEADER_STDC
-AC_FUNC_MALLOC
-AC_FUNC_SELECT_ARGTYPES
-AC_CHECK_FUNCS([floor memset pow select sqrt])
-
 AC_OUTPUT([
   Makefile
 ])