Drop autotools; move remaining useful m4 macros (#3027)

16 files changed, 760 insertions, 414 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index fa2c1e80..00000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-EXTRA_DIST = CMakeLists.txt
-
-# include_HEADERS = catch.hpp
-
-# lib_LTLIBRARIES = libtestmain.la
-
-# libtestmain_la_LDFLAGS = -no-undefined
-# libtestmain_la_SOURCES = test_main.cpp
-
-if !USE_EXTERNAL_GTEST
-MAYBE_GTEST = googletest
-endif
-SUBDIRS = cli $(MAYBE_GTEST) . gie gigs unit
diff --git a/test/cli/Makefile.am b/test/cli/Makefile.am
deleted file mode 100644
index bc840738..00000000
--- a/test/cli/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-# Executables paths passed to test scripts
-PROJ_LIB = ../../data/for_tests
-THIS_DIR = $(top_srcdir)/test/cli
-EXEPATH = ../../src
-PROJEXE = $(EXEPATH)/proj
-INVPROJEXE = $(EXEPATH)/invproj
-CS2CSEXE = $(EXEPATH)/cs2cs
-PROJINFOEXE = $(EXEPATH)/projinfo
-CCTEXE = $(EXEPATH)/cct
-PROJSYNC_EXE = $(EXEPATH)/projsync
-
-# PROJ.4 test scripts
-TEST27 = $(THIS_DIR)/test27
-TEST83 = $(THIS_DIR)/test83
-TESTPROJ = $(THIS_DIR)/testproj
-TESTINVPROJ = $(THIS_DIR)/testinvproj
-TESTNTV2 = $(THIS_DIR)/testntv2
-TESTVARIOUS = $(THIS_DIR)/testvarious
-TESTFLAKY = $(THIS_DIR)/testflaky
-TESTDATUMFILE = $(THIS_DIR)/testdatumfile
-TESTIGN = $(THIS_DIR)/testIGNF
-TESTPROJINFO = $(THIS_DIR)/testprojinfo
-TESTCCT = $(THIS_DIR)/testcct
-TESTPROJSYNC = $(THIS_DIR)/test_projsync
-
-EXTRA_DIST = pj_out27.dist pj_out83.dist td_out.dist \
-		test27 test83 tv_out.dist tf_out.dist \
-		testflaky testvarious testdatumfile testntv2 ntv2_out.dist \
-		testIGNF proj_outIGNF.dist \
-		testprojinfo testprojinfo_out.dist \
-		testcct testcct_out.dist \
-		testproj testproj_out.dist \
-		testinvproj testinvproj_out.dist \
-		test_projsync \
-		CMakeLists.txt
-
-testprojinfo-check:
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTPROJINFO) $(PROJINFOEXE)
-
-test27-check:
-	PROJ_LIB=$(PROJ_LIB) $(TEST27) $(PROJEXE)
-
-test83-check:
-	PROJ_LIB=$(PROJ_LIB) $(TEST83) $(PROJEXE)
-
-testproj-check:
-	PROJ_LIB=$(PROJ_LIB) $(TESTPROJ) $(PROJEXE)
-
-testinvproj-check:
-	PROJ_LIB=$(PROJ_LIB) $(TESTINVPROJ) $(INVPROJEXE)
-
-testvarious-check:
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTVARIOUS) $(CS2CSEXE)
-
-testdatumfile-check:
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTDATUMFILE) $(CS2CSEXE)
-
-testign-check:
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTIGN) $(CS2CSEXE)
-
-testntv2-check:
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTNTV2) $(CS2CSEXE)
-
-testcct-check:
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTCCT) $(CCTEXE)
-
-
-if HAVE_CURL
-testprojsync-check:
-	PROJ_LIB=$(PROJ_LIB) $(TESTPROJSYNC) $(PROJSYNC_EXE)
-else
-testprojsync-check:
-	echo "Skipping testprojsync-check"
-endif
-
-check-local: testprojinfo-check test27-check test83-check testproj-check testinvproj-check testvarious-check testdatumfile-check testign-check testntv2-check testcct-check testprojsync-check
diff --git a/test/gie/Makefile.am b/test/gie/Makefile.am
deleted file mode 100644
index 70d55744..00000000
--- a/test/gie/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-EXEPATH = ../../src
-GIEEXE = $(EXEPATH)/gie
-
-EXTRA_DIST = 4D-API_cs2cs-style.gie \
-	GDA.gie \
-	axisswap.gie \
-	builtins.gie \
-	deformation.gie \
-	ellipsoid.gie \
-	more_builtins.gie \
-	unitconvert.gie \
-	DHDN_ETRS89.gie \
-	geotiff_grids.gie \
-	adams_hemi.gie \
-	adams_ws1.gie \
-	adams_ws2.gie \
-	guyou.gie \
-	peirce_q.gie \
-	defmodel.gie \
-	tinshift.gie \
-	nkg.gie
-
-PROJ_LIB ?= ../../data/for_tests
-
-4D-API-cs2cs-style: 4D-API_cs2cs-style.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-GDA: GDA.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-axisswap: axisswap.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-builtins: builtins.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-deformation: deformation.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-ellipsoid: ellipsoid.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-more_builtins: more_builtins.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-unitconvert: unitconvert.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-DHDN_ETRS89: DHDN_ETRS89.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-geotiff_grids: geotiff_grids.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-adams_hemi: adams_hemi.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-adams_ws1: adams_ws1.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-adams_ws2: adams_ws2.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-guyou: guyou.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-peirce_q: peirce_q.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-defmodel: defmodel.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-tinshift: tinshift.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-check-local: 4D-API-cs2cs-style GDA axisswap builtins deformation ellipsoid more_builtins unitconvert DHDN_ETRS89 geotiff_grids adams_hemi adams_ws1 adams_ws2 guyou peirce_q defmodel tinshift
diff --git a/test/gigs/Makefile.am b/test/gigs/Makefile.am
deleted file mode 100644
index 2bdff3f2..00000000
--- a/test/gigs/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-EXEPATH = ../../src
-GIEEXE = $(EXEPATH)/gie
-
-EXTRA_DIST = \
-	5101.1-jhs.gie \
-	5101.2-jhs.gie \
-	5101.3-jhs.gie \
-	5101.4-jhs-etmerc.gie \
-	5102.1.gie \
-	5103.1.gie \
-	5103.2.gie \
-	5103.3.gie \
-	5104.gie \
-	5105.2.gie \
-	5106.gie \
-	5107.gie \
-	5109.gie \
-	5111.1.gie \
-	5112.gie \
-	5113.gie \
-	5201.gie \
-	5208.gie
-
-PROJ_LIB ?= ../../data/for_tests
-
-5101.1: 5101.1-jhs.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5101.2: 5101.2-jhs.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5101.3: 5101.3-jhs.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5101.4: 5101.4-jhs-etmerc.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5102.1: 5102.1.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5103.1: 5103.1.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5103.2: 5103.2.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5103.3: 5103.3.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5104: 5104.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5105.2: 5105.2.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5106: 5106.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5107: 5107.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5109: 5109.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5111.1: 5111.1.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5112: 5112.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5113: 5113.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5201: 5201.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-5208: 5208.gie
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $<
-
-check-local: 5101.1 5101.2 5101.3 5101.4 5102.1 5103.1 5103.2 5103.3 5104 5105.2 5106 5107 5109 5111.1 5112 5113 5201 5208
diff --git a/test/googletest/Makefile.am b/test/googletest/Makefile.am
deleted file mode 100644
index 88e6241d..00000000
--- a/test/googletest/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
-SUBDIRS = src include
-
-AM_CPPFLAGS = -I$(top_srcdir)/test/googletest/include
-
-noinst_LTLIBRARIES = libgtest.la
-
-libgtest_la_LDFLAGS = -no-undefined
-libgtest_la_SOURCES = src/gtest-all.cc
-
-EXTRA_DIST = CMakeLists.txt.in
diff --git a/test/googletest/include/Makefile.am b/test/googletest/include/Makefile.am
deleted file mode 100644
index b1f917b2..00000000
--- a/test/googletest/include/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = gtest
diff --git a/test/googletest/include/gtest/Makefile.am b/test/googletest/include/gtest/Makefile.am
deleted file mode 100644
index 31af347b..00000000
--- a/test/googletest/include/gtest/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS = internal
-EXTRA_DIST = \
-	gtest-death-test.h \
-	gtest.h \
-	gtest-message.h \
-	gtest-param-test.h \
-	gtest-param-test.h.pump \
-	gtest_pred_impl.h \
-	gtest-printers.h \
-	gtest_prod.h \
-	gtest-spi.h \
-	gtest-test-part.h \
-	gtest-typed-test.h
diff --git a/test/googletest/include/gtest/internal/Makefile.am b/test/googletest/include/gtest/internal/Makefile.am
deleted file mode 100644
index a6da4313..00000000
--- a/test/googletest/include/gtest/internal/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS = custom
-
-EXTRA_DIST = \
-	gtest-death-test-internal.h \
-	gtest-filepath.h \
-	gtest-internal.h \
-	gtest-linked_ptr.h \
-	gtest-param-util-generated.h \
-	gtest-param-util-generated.h.pump \
-	gtest-param-util.h \
-	gtest-port-arch.h \
-	gtest-port.h \
-	gtest-string.h \
-	gtest-tuple.h \
-	gtest-tuple.h.pump \
-	gtest-type-util.h \
-	gtest-type-util.h.pump
diff --git a/test/googletest/include/gtest/internal/custom/Makefile.am b/test/googletest/include/gtest/internal/custom/Makefile.am
deleted file mode 100644
index f8affb3c..00000000
--- a/test/googletest/include/gtest/internal/custom/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_DIST = \
-	gtest.h \
-	gtest-port.h \
-	gtest-printers.h
diff --git a/test/googletest/src/Makefile.am b/test/googletest/src/Makefile.am
deleted file mode 100644
index 45f9ad08..00000000
--- a/test/googletest/src/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-EXTRA_DIST = \
-	gtest-all.cc \
-	gtest.cc \
-	gtest-death-test.cc \
-	gtest-filepath.cc \
-	gtest_main.cc \
-	gtest-port.cc \
-	gtest-printers.cc \
-	gtest-test-part.cc \
-	gtest-typed-test.cc \
-	gtest-internal-inl.h
-
diff --git a/test/postinstall/c_app/configure.ac b/test/postinstall/c_app/configure.ac
index 43ae4835..6224ee4f 100644
--- a/test/postinstall/c_app/configure.ac
+++ b/test/postinstall/c_app/configure.ac
@@ -1,7 +1,7 @@
 AC_INIT([c_app], [0.1])
 AM_INIT_AUTOMAKE
 AC_PROG_CC
-AC_CONFIG_MACRO_DIR([../../../m4])
+AC_CONFIG_MACRO_DIR([../m4])
 
 PKG_CHECK_MODULES([PROJ], [proj])
 
diff --git a/test/postinstall/cpp_app/configure.ac b/test/postinstall/cpp_app/configure.ac
index 7da902a8..39eca0dc 100644
--- a/test/postinstall/cpp_app/configure.ac
+++ b/test/postinstall/cpp_app/configure.ac
@@ -2,7 +2,7 @@ AC_INIT([cpp_app], [0.1])
 AM_INIT_AUTOMAKE
 AC_PROG_CXX
 dnl Required for (e.g.) g++-4.8
-AC_CONFIG_MACRO_DIR([../../../m4])
+AC_CONFIG_MACRO_DIR([../m4])
 AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])
 
 PKG_CHECK_MODULES([PROJ], [proj])
diff --git a/test/postinstall/m4/ax_cxx_compile_stdcxx.m4 b/test/postinstall/m4/ax_cxx_compile_stdcxx.m4
new file mode 100644
index 00000000..1bff58a5
--- /dev/null
+++ b/test/postinstall/m4/ax_cxx_compile_stdcxx.m4
@@ -0,0 +1,562 @@
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the specified
+#   version of the C++ standard.  If necessary, add switches to CXX and
+#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
+#   or '14' (for the C++14 standard).
+#
+#   The second argument, if specified, indicates whether you insist on an
+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+#   -std=c++11).  If neither is specified, you get whatever works, with
+#   preference for an extended mode.
+#
+#   The third argument, if specified 'mandatory' or if left unspecified,
+#   indicates that baseline support for the specified C++ standard is
+#   required and that the macro should error out if no mode with that
+#   support is found.  If specified 'optional', then configuration proceeds
+#   regardless, after defining HAVE_CXX${VERSION} if and only if a
+#   supporting mode is found.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
+#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
+#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 4
+
+dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
+dnl  (serial version number 13).
+
+AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
+  m4_if([$1], [11], [],
+        [$1], [14], [],
+        [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])],
+        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
+  m4_if([$2], [], [],
+        [$2], [ext], [],
+        [$2], [noext], [],
+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
+  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
+        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
+        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
+        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
+  AC_LANG_PUSH([C++])dnl
+  ac_success=no
+  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
+  ax_cv_cxx_compile_cxx$1,
+  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+    [ax_cv_cxx_compile_cxx$1=yes],
+    [ax_cv_cxx_compile_cxx$1=no])])
+  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
+    ac_success=yes
+  fi
+
+  m4_if([$2], [noext], [], [dnl
+  if test x$ac_success = xno; then
+    for switch in -std=gnu++$1 -std=gnu++0x; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                     $cachevar,
+        [ac_save_CXX="$CXX"
+         CXX="$CXX $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXX="$ac_save_CXX"])
+      if eval test x\$$cachevar = xyes; then
+        CXX="$CXX $switch"
+        if test -n "$CXXCPP" ; then
+          CXXCPP="$CXXCPP $switch"
+        fi
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+
+  m4_if([$2], [ext], [], [dnl
+  if test x$ac_success = xno; then
+    dnl HP's aCC needs +std=c++11 according to:
+    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
+    dnl Cray's crayCC needs "-h std=c++11"
+    for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                     $cachevar,
+        [ac_save_CXX="$CXX"
+         CXX="$CXX $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXX="$ac_save_CXX"])
+      if eval test x\$$cachevar = xyes; then
+        CXX="$CXX $switch"
+        if test -n "$CXXCPP" ; then
+          CXXCPP="$CXXCPP $switch"
+        fi
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+  AC_LANG_POP([C++])
+  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
+    if test x$ac_success = xno; then
+      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
+    fi
+  fi
+  if test x$ac_success = xno; then
+    HAVE_CXX$1=0
+    AC_MSG_NOTICE([No compiler with C++$1 support was found])
+  else
+    HAVE_CXX$1=1
+    AC_DEFINE(HAVE_CXX$1,1,
+              [define if the compiler supports basic C++$1 syntax])
+  fi
+  AC_SUBST(HAVE_CXX$1)
+])
+
+
+dnl  Test body for checking C++11 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+)
+
+
+dnl  Test body for checking C++14 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+)
+
+
+dnl  Tests for new features in C++11
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
+
+// If the compiler admits that it is not ready for C++11, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201103L
+
+#error "This is not a C++11 compiler"
+
+#else
+
+namespace cxx11
+{
+
+  namespace test_static_assert
+  {
+
+    template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+  }
+
+  namespace test_final_override
+  {
+
+    struct Base
+    {
+      virtual void f() {}
+    };
+
+    struct Derived : public Base
+    {
+      virtual void f() override {}
+    };
+
+  }
+
+  namespace test_double_right_angle_brackets
+  {
+
+    template < typename T >
+    struct check {};
+
+    typedef check<void> single_type;
+    typedef check<check<void>> double_type;
+    typedef check<check<check<void>>> triple_type;
+    typedef check<check<check<check<void>>>> quadruple_type;
+
+  }
+
+  namespace test_decltype
+  {
+
+    int
+    f()
+    {
+      int a = 1;
+      decltype(a) b = 2;
+      return a + b;
+    }
+
+  }
+
+  namespace test_type_deduction
+  {
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static const bool value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static const bool value = true;
+    };
+
+    template < typename T1, typename T2 >
+    auto
+    add(T1 a1, T2 a2) -> decltype(a1 + a2)
+    {
+      return a1 + a2;
+    }
+
+    int
+    test(const int c, volatile int v)
+    {
+      static_assert(is_same<int, decltype(0)>::value == true, "");
+      static_assert(is_same<int, decltype(c)>::value == false, "");
+      static_assert(is_same<int, decltype(v)>::value == false, "");
+      auto ac = c;
+      auto av = v;
+      auto sumi = ac + av + 'x';
+      auto sumf = ac + av + 1.0;
+      static_assert(is_same<int, decltype(ac)>::value == true, "");
+      static_assert(is_same<int, decltype(av)>::value == true, "");
+      static_assert(is_same<int, decltype(sumi)>::value == true, "");
+      static_assert(is_same<int, decltype(sumf)>::value == false, "");
+      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
+      return (sumf > 0.0) ? sumi : add(c, v);
+    }
+
+  }
+
+  namespace test_noexcept
+  {
+
+    int f() { return 0; }
+    int g() noexcept { return 0; }
+
+    static_assert(noexcept(f()) == false, "");
+    static_assert(noexcept(g()) == true, "");
+
+  }
+
+  namespace test_constexpr
+  {
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
+    {
+      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
+    }
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c(const CharT *const s) noexcept
+    {
+      return strlen_c_r(s, 0UL);
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("1") == 1UL, "");
+    static_assert(strlen_c("example") == 7UL, "");
+    static_assert(strlen_c("another\0example") == 7UL, "");
+
+  }
+
+  namespace test_rvalue_references
+  {
+
+    template < int N >
+    struct answer
+    {
+      static constexpr int value = N;
+    };
+
+    answer<1> f(int&)       { return answer<1>(); }
+    answer<2> f(const int&) { return answer<2>(); }
+    answer<3> f(int&&)      { return answer<3>(); }
+
+    void
+    test()
+    {
+      int i = 0;
+      const int c = 0;
+      static_assert(decltype(f(i))::value == 1, "");
+      static_assert(decltype(f(c))::value == 2, "");
+      static_assert(decltype(f(0))::value == 3, "");
+    }
+
+  }
+
+  namespace test_uniform_initialization
+  {
+
+    struct test
+    {
+      static const int zero {};
+      static const int one {1};
+    };
+
+    static_assert(test::zero == 0, "");
+    static_assert(test::one == 1, "");
+
+  }
+
+  namespace test_lambdas
+  {
+
+    void
+    test1()
+    {
+      auto lambda1 = [](){};
+      auto lambda2 = lambda1;
+      lambda1();
+      lambda2();
+    }
+
+    int
+    test2()
+    {
+      auto a = [](int i, int j){ return i + j; }(1, 2);
+      auto b = []() -> int { return '0'; }();
+      auto c = [=](){ return a + b; }();
+      auto d = [&](){ return c; }();
+      auto e = [a, &b](int x) mutable {
+        const auto identity = [](int y){ return y; };
+        for (auto i = 0; i < a; ++i)
+          a += b--;
+        return x + identity(a + b);
+      }(0);
+      return a + b + c + d + e;
+    }
+
+    int
+    test3()
+    {
+      const auto nullary = [](){ return 0; };
+      const auto unary = [](int x){ return x; };
+      using nullary_t = decltype(nullary);
+      using unary_t = decltype(unary);
+      const auto higher1st = [](nullary_t f){ return f(); };
+      const auto higher2nd = [unary](nullary_t f1){
+        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
+      };
+      return higher1st(nullary) + higher2nd(nullary)(unary);
+    }
+
+  }
+
+  namespace test_variadic_templates
+  {
+
+    template <int...>
+    struct sum;
+
+    template <int N0, int... N1toN>
+    struct sum<N0, N1toN...>
+    {
+      static constexpr auto value = N0 + sum<N1toN...>::value;
+    };
+
+    template <>
+    struct sum<>
+    {
+      static constexpr auto value = 0;
+    };
+
+    static_assert(sum<>::value == 0, "");
+    static_assert(sum<1>::value == 1, "");
+    static_assert(sum<23>::value == 23, "");
+    static_assert(sum<1, 2>::value == 3, "");
+    static_assert(sum<5, 5, 11>::value == 21, "");
+    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
+
+  }
+
+  // https://stackoverflow.com/q/13728184
+  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
+  // because of this.
+  namespace test_template_alias_sfinae
+  {
+
+    struct foo {};
+
+    template<typename T>
+    using member = typename T::member_type;
+
+    template<typename T>
+    void func(...) {}
+
+    template<typename T>
+    void func(member<T>*) {}
+
+    void test();
+
+    void test() { func<foo>(0); }
+
+  }
+
+}  // namespace cxx11
+
+#endif  // __cplusplus >= 201103L
+
+]])
+
+
+dnl  Tests for new features in C++14
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
+
+// If the compiler admits that it is not ready for C++14, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201402L
+
+#error "This is not a C++14 compiler"
+
+#else
+
+namespace cxx14
+{
+
+  namespace test_polymorphic_lambdas
+  {
+
+    int
+    test()
+    {
+      const auto lambda = [](auto&&... args){
+        const auto istiny = [](auto x){
+          return (sizeof(x) == 1UL) ? 1 : 0;
+        };
+        const int aretiny[] = { istiny(args)... };
+        return aretiny[0];
+      };
+      return lambda(1, 1L, 1.0f, '1');
+    }
+
+  }
+
+  namespace test_binary_literals
+  {
+
+    constexpr auto ivii = 0b0000000000101010;
+    static_assert(ivii == 42, "wrong value");
+
+  }
+
+  namespace test_generalized_constexpr
+  {
+
+    template < typename CharT >
+    constexpr unsigned long
+    strlen_c(const CharT *const s) noexcept
+    {
+      auto length = 0UL;
+      for (auto p = s; *p; ++p)
+        ++length;
+      return length;
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("x") == 1UL, "");
+    static_assert(strlen_c("test") == 4UL, "");
+    static_assert(strlen_c("another\0test") == 7UL, "");
+
+  }
+
+  namespace test_lambda_init_capture
+  {
+
+    int
+    test()
+    {
+      auto x = 0;
+      const auto lambda1 = [a = x](int b){ return a + b; };
+      const auto lambda2 = [a = lambda1(x)](){ return a; };
+      return lambda2();
+    }
+
+  }
+
+  namespace test_digit_seperators
+  {
+
+    constexpr auto ten_million = 100'000'000;
+    static_assert(ten_million == 100000000, "");
+
+  }
+
+  namespace test_return_type_deduction
+  {
+
+    auto f(int& x) { return x; }
+    decltype(auto) g(int& x) { return x; }
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static constexpr auto value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static constexpr auto value = true;
+    };
+
+    int
+    test()
+    {
+      auto x = 0;
+      static_assert(is_same<int, decltype(f(x))>::value, "");
+      static_assert(is_same<int&, decltype(g(x))>::value, "");
+      return x;
+    }
+
+  }
+
+}  // namespace cxx14
+
+#endif  // __cplusplus >= 201402L
+
+]])
diff --git a/test/postinstall/m4/ax_cxx_compile_stdcxx_11.m4 b/test/postinstall/m4/ax_cxx_compile_stdcxx_11.m4
new file mode 100644
index 00000000..0aadeafe
--- /dev/null
+++ b/test/postinstall/m4/ax_cxx_compile_stdcxx_11.m4
@@ -0,0 +1,39 @@
+# ============================================================================
+#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
+# ============================================================================
+#
+# SYNOPSIS
+#
+#   AX_CXX_COMPILE_STDCXX_11([ext|noext], [mandatory|optional])
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the C++11
+#   standard; if necessary, add switches to CXX and CXXCPP to enable
+#   support.
+#
+#   This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX
+#   macro with the version set to C++11.  The two optional arguments are
+#   forwarded literally as the second and third argument respectively.
+#   Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for
+#   more information.  If you want to use this macro, you also need to
+#   download the ax_cxx_compile_stdcxx.m4 file.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
+#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
+#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 17
+
+AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])])
diff --git a/test/postinstall/m4/pkg.m4 b/test/postinstall/m4/pkg.m4
new file mode 100644
index 00000000..452488c8
--- /dev/null
+++ b/test/postinstall/m4/pkg.m4
@@ -0,0 +1,157 @@
+# pkg.m4 - Macros to locate and utilize pkg-config.            -*- Autoconf -*-
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+		
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        pkg_cv_[]$1="$$1"
+    else
+        PKG_CHECK_EXISTS([$3],
+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+			 [pkg_failed=yes])
+    fi
+else
+	pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
+elif test $pkg_failed = untried; then
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+		[$4])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
deleted file mode 100644
index 9ca3a723..00000000
--- a/test/unit/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
-EXTRA_DIST = CMakeLists.txt
-
-noinst_HEADERS = gtest_include.h test_primitives.hpp
-
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/test @GTEST_CFLAGS@ @SQLITE3_CFLAGS@ -DMUTEX_@MUTEX_SETTING@
-AM_CXXFLAGS = @CXX_WFLAGS@ @NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG@
-
-PROJ_LIB ?= ../../data/for_tests
-
-noinst_PROGRAMS = pj_phi2_test
-noinst_PROGRAMS += proj_errno_string_test
-noinst_PROGRAMS += proj_angular_io_test
-noinst_PROGRAMS += proj_context_test
-noinst_PROGRAMS += test_cpp_api
-noinst_PROGRAMS += gie_self_tests
-noinst_PROGRAMS += include_proj_h_from_c
-noinst_PROGRAMS += test_network
-noinst_PROGRAMS += test_defmodel
-noinst_PROGRAMS += test_tinshift
-noinst_PROGRAMS += test_misc
-noinst_PROGRAMS += test_fork
-
-pj_phi2_test_SOURCES = pj_phi2_test.cpp main.cpp
-pj_phi2_test_LDADD = ../../src/libproj.la @GTEST_LIBS@
-
-pj_phi2_test-check: pj_phi2_test
-	./pj_phi2_test
-
-proj_errno_string_test_SOURCES = proj_errno_string_test.cpp main.cpp
-proj_errno_string_test_LDADD= ../../src/libproj.la @GTEST_LIBS@
-
-proj_errno_string_test-check: proj_errno_string_test
-	./proj_errno_string_test
-
-proj_angular_io_test_SOURCES = proj_angular_io_test.cpp main.cpp
-proj_angular_io_test_LDADD = ../../src/libproj.la @GTEST_LIBS@
-
-proj_angular_io_test-check: proj_angular_io_test
-	./proj_angular_io_test
-
-proj_context_test_SOURCES = proj_context_test.cpp main.cpp
-proj_context_test_LDADD = ../../src/libproj.la @GTEST_LIBS@
-
-proj_context_test-check: proj_context_test
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES ./proj_context_test
-
-test_cpp_api_SOURCES = test_util.cpp \
-			test_common.cpp \
-			test_crs.cpp \
-			test_metadata.cpp \
-			test_io.cpp \
-			test_operation.cpp \
-			test_operationfactory.cpp \
-			test_datum.cpp \
-			test_factory.cpp \
-			test_c_api.cpp \
-			test_grids.cpp \
-			main.cpp
-test_cpp_api_LDADD = ../../src/libproj.la @GTEST_LIBS@ @SQLITE3_LIBS@
-
-test_cpp_api-check: test_cpp_api
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) ./test_cpp_api
-
-gie_self_tests_SOURCES = gie_self_tests.cpp main.cpp
-gie_self_tests_LDADD = ../../src/libproj.la @GTEST_LIBS@ @SQLITE3_LIBS@
-
-gie_self_tests-check: gie_self_tests
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) ./gie_self_tests
-
-include_proj_h_from_c_SOURCES = include_proj_h_from_c.c
-
-test_network_SOURCES = test_network.cpp main.cpp
-test_network_CXXFLAGS = @CURL_CFLAGS@ @CURL_ENABLED_FLAGS@
-test_network_LDADD = ../../src/libproj.la @GTEST_LIBS@ @SQLITE3_LIBS@ @CURL_LIBS@
-
-test_network-check: test_network
-	PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) PROJ_SOURCE_DATA=$(PROJ_LIB) ./test_network
-
-test_defmodel_SOURCES = test_defmodel.cpp main.cpp
-test_defmodel_LDADD = ../../src/libproj.la @GTEST_LIBS@
-
-test_defmodel-check: test_defmodel
-	PROJ_LIB=$(PROJ_LIB) ./test_defmodel
-
-test_tinshift_SOURCES = test_tinshift.cpp main.cpp
-test_tinshift_LDADD = ../../src/libproj.la @GTEST_LIBS@
-
-test_tinshift-check: test_tinshift
-	PROJ_LIB=$(PROJ_LIB) ./test_tinshift
-
-test_misc_SOURCES = test_misc.cpp main.cpp
-test_misc_LDADD = ../../src/libproj.la @GTEST_LIBS@
-
-test_misc-check: test_misc
-	PROJ_LIB=$(PROJ_LIB) ./test_misc
-
-test_fork_SOURCES = test_fork.c
-test_fork_LDADD = ../../src/libproj.la @THREAD_LIB@
-
-test_fork-check: test_fork
-	PROJ_LIB=$(PROJ_LIB) ./test_fork
-
-check-local: pj_phi2_test-check proj_errno_string_test-check \
-		proj_angular_io_test-check proj_context_test-check test_cpp_api-check \
-		gie_self_tests-check test_network-check test_defmodel-check test_tinshift-check \
-		test_misc-check test_fork-check