Changed self-test build behaviour from opt-out to opt-in

109 files changed, 161 insertions, 151 deletions

diff --git a/.travis.yml b/.travis.yml
index a476f875..a4378d9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,9 +91,9 @@ install:
   - cd ..
 # autoconf build with grids and coverage
   - if [ $TRAVIS_OS_NAME == "osx" ]; then
-      CFLAGS="--coverage" ./configure;
+      CFLAGS="-DPJ_SELFTEST --coverage" ./configure;
     else
-      CFLAGS="--coverage" LDFLAGS="-lgcov" ./configure;
+      CFLAGS="-DPJ_SELFTEST --coverage" LDFLAGS="-lgcov" ./configure;
     fi
   - make -j3
   - make check
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6b2bf35..cde21f0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,15 @@ include(Proj4Mac)
 include(policies)
 
 #################################################################################
+# Self-test build config
+#################################################################################
+
+option(SELFTEST "Include self-test in build" OFF)
+if(SELFTEST)
+    add_definitions(-DPJ_SELFTEST)
+endif(SELFTEST)
+
+#################################################################################
 # threading configuration
 #################################################################################
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
diff --git a/appveyor.yml b/appveyor.yml
index 9d1df0a5..9397d627 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -31,16 +31,16 @@ build_script:
   - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x86" call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat"
   - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
   - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
-  - if "%BUILD_TYPE%" == "nmake" nmake /f makefile.vc
+  - if "%BUILD_TYPE%" == "nmake" nmake /f makefile.vc SELFTEST=1
   - if "%BUILD_TYPE%" == "nmake" nmake /f makefile.vc install-all
   - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" cd src
-  - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" nmake /f makefile.vc multistresstest.exe
+  - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" nmake /f makefile.vc SELFTEST=1 multistresstest.exe
 # Disabled for now as it scales badly
 #  - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" multistresstest.exe
   - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64
   - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x86" SET VS_FULL=%VS_VERSION%
   - if "%BUILD_TYPE%" == "cmake" echo "%VS_FULL%"
-  - if "%BUILD_TYPE%" == "cmake" cmake -G "%VS_FULL%" . -DCMAKE_BUILD_TYPE=Release -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=../bin -DBUILD_LIBPROJ_SHARED=ON
+  - if "%BUILD_TYPE%" == "cmake" cmake -G "%VS_FULL%" . -DSELFTEST=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=../bin -DBUILD_LIBPROJ_SHARED=ON
   - if "%BUILD_TYPE%" == "cmake" cmake --build . --config Release
 
 test_script:
diff --git a/nmake.opt b/nmake.opt
index 79637ea4..2291fad8 100644
--- a/nmake.opt
+++ b/nmake.opt
@@ -22,12 +22,16 @@ PROJ_LIB_DIR=$(INSTDIR)\SHARE
 # Uncomment the first for an optimized build, or the second for debug.
 !IFNDEF OPTFLAGS
 !IFNDEF DEBUG
-OPTFLAGS=	/nologo /Ox /Op /MD
+OPTFLAGS=	/Ox /Op /MD
 !ELSE
-OPTFLAGS=	/nologo /Zi /MD /Fdproj.pdb
+OPTFLAGS=	/Zi /MD /Fdproj.pdb
 !ENDIF
 !ENDIF
 
+!IFDEF SELFTEST
+OPTFLAGS= $(OPTFLAGS) -DPJ_SELFTEST
+!ENDIF
+
 # Uncomment the first for linking exes against DLL or second for static
 EXE_PROJ =	proj_i.lib
 #EXE_PROJ =	proj.lib
diff --git a/src/PJ_aea.c b/src/PJ_aea.c
index b8267e0f..f30d3b6c 100644
--- a/src/PJ_aea.c
+++ b/src/PJ_aea.c
@@ -211,7 +211,7 @@ PJ *PROJECTION(leac) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_aea_selftest (void) {return 10000;}
 #else
 
@@ -271,7 +271,7 @@ int pj_aea_selftest (void) {
 
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_leac_selftest (void) {return 10000;}
 #else
 
diff --git a/src/PJ_aeqd.c b/src/PJ_aeqd.c
index 2b832edd..d1dcdaa1 100644
--- a/src/PJ_aeqd.c
+++ b/src/PJ_aeqd.c
@@ -310,7 +310,7 @@ PJ *PROJECTION(aeqd) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_aeqd_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_airy.c b/src/PJ_airy.c
index 8b619010..3a91986e 100644
--- a/src/PJ_airy.c
+++ b/src/PJ_airy.c
@@ -156,7 +156,7 @@ PJ *PROJECTION(airy) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_airy_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_aitoff.c b/src/PJ_aitoff.c
index b7f33d22..5cd717b1 100644
--- a/src/PJ_aitoff.c
+++ b/src/PJ_aitoff.c
@@ -200,7 +200,7 @@ PJ *PROJECTION(wintri) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_aitoff_selftest (void) {return 0;}
 #else
 
@@ -248,7 +248,7 @@ int pj_aitoff_selftest (void) {
 
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_wintri_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_august.c b/src/PJ_august.c
index 83463e9f..f5028938 100644
--- a/src/PJ_august.c
+++ b/src/PJ_august.c
@@ -40,7 +40,7 @@ PJ *PROJECTION(august) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_august_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_bacon.c b/src/PJ_bacon.c
index ce6725cb..a9c6da44 100644
--- a/src/PJ_bacon.c
+++ b/src/PJ_bacon.c
@@ -91,7 +91,7 @@ PJ *PROJECTION(ortel) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_bacon_selftest (void) {return 0;}
 #else
 int pj_bacon_selftest (void) {
@@ -121,7 +121,7 @@ int pj_bacon_selftest (void) {
 
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_apian_selftest (void) {return 0;}
 #else
 int pj_apian_selftest (void) {
@@ -151,7 +151,7 @@ int pj_apian_selftest (void) {
 
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_ortel_selftest (void) {return 0;}
 #else
 int pj_ortel_selftest (void) {
diff --git a/src/PJ_bipc.c b/src/PJ_bipc.c
index 2a5b3105..f370b4f9 100644
--- a/src/PJ_bipc.c
+++ b/src/PJ_bipc.c
@@ -164,7 +164,7 @@ PJ *PROJECTION(bipc) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_bipc_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_boggs.c b/src/PJ_boggs.c
index 1bc7de13..8ede9f16 100644
--- a/src/PJ_boggs.c
+++ b/src/PJ_boggs.c
@@ -49,7 +49,7 @@ PJ *PROJECTION(boggs) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_boggs_selftest (void) {return 0;}
 #else
 int pj_boggs_selftest (void) {
diff --git a/src/PJ_bonne.c b/src/PJ_bonne.c
index 56656f16..ac2249f8 100644
--- a/src/PJ_bonne.c
+++ b/src/PJ_bonne.c
@@ -121,7 +121,7 @@ PJ *PROJECTION(bonne) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_bonne_selftest (void) {return 0;}
 #else
 int pj_bonne_selftest (void) {
diff --git a/src/PJ_calcofi.c b/src/PJ_calcofi.c
index 23c42c4f..b9a8ca22 100644
--- a/src/PJ_calcofi.c
+++ b/src/PJ_calcofi.c
@@ -166,7 +166,7 @@ PJ *PROJECTION(calcofi) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_calcofi_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_cass.c b/src/PJ_cass.c
index 28d35b91..1eb978e5 100644
--- a/src/PJ_cass.c
+++ b/src/PJ_cass.c
@@ -120,7 +120,7 @@ PJ *PROJECTION(cass) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_cass_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_cc.c b/src/PJ_cc.c
index 34194418..1b5d3152 100644
--- a/src/PJ_cc.c
+++ b/src/PJ_cc.c
@@ -44,7 +44,7 @@ PJ *PROJECTION(cc) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_cc_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_cea.c b/src/PJ_cea.c
index 90425436..723611cf 100644
--- a/src/PJ_cea.c
+++ b/src/PJ_cea.c
@@ -96,7 +96,7 @@ PJ *PROJECTION(cea) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_cea_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_chamb.c b/src/PJ_chamb.c
index f38dc6b7..6bacbbe9 100644
--- a/src/PJ_chamb.c
+++ b/src/PJ_chamb.c
@@ -148,7 +148,7 @@ PJ *PROJECTION(chamb) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_chamb_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_collg.c b/src/PJ_collg.c
index 939eb2d2..baac1af9 100644
--- a/src/PJ_collg.c
+++ b/src/PJ_collg.c
@@ -53,7 +53,7 @@ PJ *PROJECTION(collg) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_collg_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_comill.c b/src/PJ_comill.c
index 97b659da..c492dc95 100644
--- a/src/PJ_comill.c
+++ b/src/PJ_comill.c
@@ -86,7 +86,7 @@ PJ *PROJECTION(comill) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_comill_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_crast.c b/src/PJ_crast.c
index 4773ee7c..09c4f1e4 100644
--- a/src/PJ_crast.c
+++ b/src/PJ_crast.c
@@ -48,7 +48,7 @@ PJ *PROJECTION(crast) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_crast_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_denoy.c b/src/PJ_denoy.c
index 10005a31..9eb818b9 100644
--- a/src/PJ_denoy.c
+++ b/src/PJ_denoy.c
@@ -39,7 +39,7 @@ PJ *PROJECTION(denoy) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_denoy_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_eck1.c b/src/PJ_eck1.c
index f285e00b..da159017 100644
--- a/src/PJ_eck1.c
+++ b/src/PJ_eck1.c
@@ -48,7 +48,7 @@ PJ *PROJECTION(eck1) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_eck1_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_eck2.c b/src/PJ_eck2.c
index c6eac8b2..763039a9 100644
--- a/src/PJ_eck2.c
+++ b/src/PJ_eck2.c
@@ -59,7 +59,7 @@ PJ *PROJECTION(eck2) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_eck2_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_eck3.c b/src/PJ_eck3.c
index 3eb7f8f9..d70838d2 100644
--- a/src/PJ_eck3.c
+++ b/src/PJ_eck3.c
@@ -117,7 +117,7 @@ PJ *PROJECTION(putp1) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_eck3_selftest (void) {return 0;}
 #else
 
@@ -161,7 +161,7 @@ int pj_eck3_selftest (void) {
 
 #endif
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_kav7_selftest (void) {return 0;}
 #else
 
@@ -205,7 +205,7 @@ int pj_kav7_selftest (void) {
 
 #endif
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_wag6_selftest (void) {return 0;}
 #else
 
@@ -250,7 +250,7 @@ int pj_wag6_selftest (void) {
 #endif
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_putp1_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_eck4.c b/src/PJ_eck4.c
index 66eaa9d0..358c0224 100644
--- a/src/PJ_eck4.c
+++ b/src/PJ_eck4.c
@@ -72,7 +72,7 @@ PJ *PROJECTION(eck4) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_eck4_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_eck5.c b/src/PJ_eck5.c
index 4d1eeb17..5fbdf7db 100644
--- a/src/PJ_eck5.c
+++ b/src/PJ_eck5.c
@@ -48,7 +48,7 @@ PJ *PROJECTION(eck5) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_eck5_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_eqc.c b/src/PJ_eqc.c
index 3fcb1007..6f0cfcf1 100644
--- a/src/PJ_eqc.c
+++ b/src/PJ_eqc.c
@@ -63,7 +63,7 @@ PJ *PROJECTION(eqc) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_eqc_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_eqdc.c b/src/PJ_eqdc.c
index ce1a8bd8..1fc4cef7 100644
--- a/src/PJ_eqdc.c
+++ b/src/PJ_eqdc.c
@@ -130,7 +130,7 @@ PJ *PROJECTION(eqdc) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_eqdc_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_fahey.c b/src/PJ_fahey.c
index 69fd40b7..4f4b92a4 100644
--- a/src/PJ_fahey.c
+++ b/src/PJ_fahey.c
@@ -50,7 +50,7 @@ PJ *PROJECTION(fahey) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_fahey_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_fouc_s.c b/src/PJ_fouc_s.c
index ae176d71..4392a6ec 100644
--- a/src/PJ_fouc_s.c
+++ b/src/PJ_fouc_s.c
@@ -81,7 +81,7 @@ PJ *PROJECTION(fouc_s) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_fouc_s_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_gall.c b/src/PJ_gall.c
index b3d7cc6c..bca36bc7 100644
--- a/src/PJ_gall.c
+++ b/src/PJ_gall.c
@@ -55,7 +55,7 @@ PJ *PROJECTION(gall) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_gall_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_geos.c b/src/PJ_geos.c
index 578608c9..283063ba 100644
--- a/src/PJ_geos.c
+++ b/src/PJ_geos.c
@@ -239,7 +239,7 @@ PJ *PROJECTION(geos) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_geos_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_gins8.c b/src/PJ_gins8.c
index 3eae7efa..48bdf3a5 100644
--- a/src/PJ_gins8.c
+++ b/src/PJ_gins8.c
@@ -44,7 +44,7 @@ PJ *PROJECTION(gins8) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_gins8_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_gn_sinu.c b/src/PJ_gn_sinu.c
index dffc9d4c..b35ee290 100644
--- a/src/PJ_gn_sinu.c
+++ b/src/PJ_gn_sinu.c
@@ -180,7 +180,7 @@ PJ *PROJECTION(gn_sinu) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_sinu_selftest (void) {return 0;}
 #else
 
@@ -239,7 +239,7 @@ int pj_sinu_selftest (void) {
 
 #endif
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_eck6_selftest (void) {return 0;}
 #else
 
@@ -283,7 +283,7 @@ int pj_eck6_selftest (void) {
 
 #endif
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_mbtfps_selftest (void) {return 0;}
 #else
 
@@ -328,7 +328,7 @@ int pj_mbtfps_selftest (void) {
 #endif
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_gn_sinu_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_gnom.c b/src/PJ_gnom.c
index 1571e6e3..37f5d71f 100644
--- a/src/PJ_gnom.c
+++ b/src/PJ_gnom.c
@@ -147,7 +147,7 @@ PJ *PROJECTION(gnom) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_gnom_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_goode.c b/src/PJ_goode.c
index d44bd2a1..fd63fa83 100644
--- a/src/PJ_goode.c
+++ b/src/PJ_goode.c
@@ -85,7 +85,7 @@ PJ *PROJECTION(goode) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_goode_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_gstmerc.c b/src/PJ_gstmerc.c
index 2720c945..0951aacf 100644
--- a/src/PJ_gstmerc.c
+++ b/src/PJ_gstmerc.c
@@ -85,7 +85,7 @@ PJ *PROJECTION(gstmerc) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_gstmerc_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_hammer.c b/src/PJ_hammer.c
index 3118640b..891baa00 100644
--- a/src/PJ_hammer.c
+++ b/src/PJ_hammer.c
@@ -84,7 +84,7 @@ PJ *PROJECTION(hammer) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_hammer_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_hatano.c b/src/PJ_hatano.c
index 67973b17..9e681a3d 100644
--- a/src/PJ_hatano.c
+++ b/src/PJ_hatano.c
@@ -89,7 +89,7 @@ PJ *PROJECTION(hatano) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_hatano_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_healpix.c b/src/PJ_healpix.c
index 5aae9c6b..c5374df7 100644
--- a/src/PJ_healpix.c
+++ b/src/PJ_healpix.c
@@ -662,7 +662,7 @@ PJ *PROJECTION(rhealpix) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_healpix_selftest (void) {return 0;}
 #else
 
@@ -721,7 +721,7 @@ int pj_healpix_selftest (void) {
 
 #endif
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_rhealpix_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_igh.c b/src/PJ_igh.c
index 533c3aa0..87efd6e7 100644
--- a/src/PJ_igh.c
+++ b/src/PJ_igh.c
@@ -225,7 +225,7 @@ PJ *PROJECTION(igh) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_igh_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_imw_p.c b/src/PJ_imw_p.c
index a1675a90..b3ca185e 100644
--- a/src/PJ_imw_p.c
+++ b/src/PJ_imw_p.c
@@ -193,7 +193,7 @@ PJ *PROJECTION(imw_p) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_imw_p_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_isea.c b/src/PJ_isea.c
index 1eaec1f9..34a2aac8 100644
--- a/src/PJ_isea.c
+++ b/src/PJ_isea.c
@@ -1145,7 +1145,7 @@ PJ *PROJECTION(isea) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_isea_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_krovak.c b/src/PJ_krovak.c
index 562a37cd..136978a0 100644
--- a/src/PJ_krovak.c
+++ b/src/PJ_krovak.c
@@ -231,7 +231,7 @@ PJ *PROJECTION(krovak) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_krovak_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_labrd.c b/src/PJ_labrd.c
index 1666a5bb..d0fad627 100644
--- a/src/PJ_labrd.c
+++ b/src/PJ_labrd.c
@@ -141,7 +141,7 @@ PJ *PROJECTION(labrd) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_labrd_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_laea.c b/src/PJ_laea.c
index f1cc9c7f..c9aef5c3 100644
--- a/src/PJ_laea.c
+++ b/src/PJ_laea.c
@@ -278,7 +278,7 @@ PJ *PROJECTION(laea) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_laea_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_lagrng.c b/src/PJ_lagrng.c
index 3c89ebc5..142c28ab 100644
--- a/src/PJ_lagrng.c
+++ b/src/PJ_lagrng.c
@@ -72,7 +72,7 @@ PJ *PROJECTION(lagrng) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_lagrng_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_larr.c b/src/PJ_larr.c
index f55289b1..dba2534c 100644
--- a/src/PJ_larr.c
+++ b/src/PJ_larr.c
@@ -39,7 +39,7 @@ PJ *PROJECTION(larr) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_larr_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_lask.c b/src/PJ_lask.c
index 38e7045c..9aa96206 100644
--- a/src/PJ_lask.c
+++ b/src/PJ_lask.c
@@ -50,7 +50,7 @@ PJ *PROJECTION(lask) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_lask_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_lcc.c b/src/PJ_lcc.c
index e53ee9ba..1c05a7fe 100644
--- a/src/PJ_lcc.c
+++ b/src/PJ_lcc.c
@@ -151,7 +151,7 @@ PJ *PROJECTION(lcc) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_lcc_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_lcca.c b/src/PJ_lcca.c
index 50c89978..4a586308 100644
--- a/src/PJ_lcca.c
+++ b/src/PJ_lcca.c
@@ -111,7 +111,7 @@ PJ *PROJECTION(lcca) {
 
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_lcca_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_loxim.c b/src/PJ_loxim.c
index 0ce81c2c..57f07048 100644
--- a/src/PJ_loxim.c
+++ b/src/PJ_loxim.c
@@ -85,7 +85,7 @@ PJ *PROJECTION(loxim) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_loxim_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_lsat.c b/src/PJ_lsat.c
index dcbed485..292a5827 100644
--- a/src/PJ_lsat.c
+++ b/src/PJ_lsat.c
@@ -211,7 +211,7 @@ PJ *PROJECTION(lsat) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_lsat_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_mbt_fps.c b/src/PJ_mbt_fps.c
index daa1555c..5a3f3774 100644
--- a/src/PJ_mbt_fps.c
+++ b/src/PJ_mbt_fps.c
@@ -67,7 +67,7 @@ PJ *PROJECTION(mbt_fps) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_mbt_fps_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_mbtfpp.c b/src/PJ_mbtfpp.c
index 729c7076..172be236 100644
--- a/src/PJ_mbtfpp.c
+++ b/src/PJ_mbtfpp.c
@@ -69,7 +69,7 @@ PJ *PROJECTION(mbtfpp) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_mbtfpp_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_mbtfpq.c b/src/PJ_mbtfpq.c
index a1cc33c8..7a436721 100644
--- a/src/PJ_mbtfpq.c
+++ b/src/PJ_mbtfpq.c
@@ -76,7 +76,7 @@ PJ *PROJECTION(mbtfpq) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_mbtfpq_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_merc.c b/src/PJ_merc.c
index 8318aa1c..4740e1eb 100644
--- a/src/PJ_merc.c
+++ b/src/PJ_merc.c
@@ -74,7 +74,7 @@ PJ *PROJECTION(merc) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_merc_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_mill.c b/src/PJ_mill.c
index c4af4c51..17763410 100644
--- a/src/PJ_mill.c
+++ b/src/PJ_mill.c
@@ -47,7 +47,7 @@ PJ *PROJECTION(mill) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_mill_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_misrsom.c b/src/PJ_misrsom.c
index 412aa817..2e7e6b52 100644
--- a/src/PJ_misrsom.c
+++ b/src/PJ_misrsom.c
@@ -221,7 +221,7 @@ PJ *PROJECTION(misrsom) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_misrsom_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_mod_ster.c b/src/PJ_mod_ster.c
index f4f3d9d1..785285db 100644
--- a/src/PJ_mod_ster.c
+++ b/src/PJ_mod_ster.c
@@ -287,7 +287,7 @@ PJ *PROJECTION(gs50) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_mil_os_selftest (void) {return 0;}
 #else
 
@@ -331,7 +331,7 @@ int pj_mil_os_selftest (void) {
 #endif
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_lee_os_selftest (void) {return 0;}
 #else
 
@@ -375,7 +375,7 @@ int pj_lee_os_selftest (void) {
 #endif
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_gs48_selftest (void) {return 0;}
 #else
 
@@ -420,7 +420,7 @@ int pj_gs48_selftest (void) {
 #endif
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_alsk_selftest (void) {return 0;}
 #else
 
@@ -481,7 +481,7 @@ int pj_alsk_selftest (void) {
 #endif
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_gs50_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_moll.c b/src/PJ_moll.c
index 2a651080..b975cc73 100644
--- a/src/PJ_moll.c
+++ b/src/PJ_moll.c
@@ -123,7 +123,7 @@ PJ *PROJECTION(wag5) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_moll_selftest (void) {return 0;}
 #else
 
@@ -167,7 +167,7 @@ int pj_moll_selftest (void) {
 #endif
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_wag4_selftest (void) {return 0;}
 #else
 
@@ -210,7 +210,7 @@ int pj_wag4_selftest (void) {
 
 #endif
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_wag5_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_natearth.c b/src/PJ_natearth.c
index 65a56629..22bf340d 100644
--- a/src/PJ_natearth.c
+++ b/src/PJ_natearth.c
@@ -105,7 +105,7 @@ PJ *PROJECTION(natearth) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_natearth_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_natearth2.c b/src/PJ_natearth2.c
index 18b5e291..9cd93fdf 100644
--- a/src/PJ_natearth2.c
+++ b/src/PJ_natearth2.c
@@ -102,7 +102,7 @@ PJ *PROJECTION(natearth2) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_natearth2_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_nell.c b/src/PJ_nell.c
index b69b9997..1b6af010 100644
--- a/src/PJ_nell.c
+++ b/src/PJ_nell.c
@@ -61,7 +61,7 @@ PJ *PROJECTION(nell) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_nell_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_nell_h.c b/src/PJ_nell_h.c
index 3523e535..dfad72b2 100644
--- a/src/PJ_nell_h.c
+++ b/src/PJ_nell_h.c
@@ -64,7 +64,7 @@ PJ *PROJECTION(nell_h) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_nell_h_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_nocol.c b/src/PJ_nocol.c
index 029f785b..88836a10 100644
--- a/src/PJ_nocol.c
+++ b/src/PJ_nocol.c
@@ -65,7 +65,7 @@ PJ *PROJECTION(nicol) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_nicol_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_nsper.c b/src/PJ_nsper.c
index c71f11e1..014c711b 100644
--- a/src/PJ_nsper.c
+++ b/src/PJ_nsper.c
@@ -197,7 +197,7 @@ PJ *PROJECTION(tpers) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_nsper_selftest (void) {return 0;}
 #else
 
@@ -242,7 +242,7 @@ int pj_nsper_selftest (void) {
 #endif
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_tpers_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_nzmg.c b/src/PJ_nzmg.c
index 8dcb2634..6c705502 100644
--- a/src/PJ_nzmg.c
+++ b/src/PJ_nzmg.c
@@ -132,7 +132,7 @@ PJ *PROJECTION(nzmg) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_nzmg_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_ob_tran.c b/src/PJ_ob_tran.c
index e135fb91..b0c22f66 100644
--- a/src/PJ_ob_tran.c
+++ b/src/PJ_ob_tran.c
@@ -181,7 +181,7 @@ PJ *PROJECTION(ob_tran) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_ob_tran_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_ocea.c b/src/PJ_ocea.c
index 2a3235c8..e77ae54a 100644
--- a/src/PJ_ocea.c
+++ b/src/PJ_ocea.c
@@ -108,7 +108,7 @@ PJ *PROJECTION(ocea) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_ocea_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_oea.c b/src/PJ_oea.c
index f29dcfd0..1ad8ddb2 100644
--- a/src/PJ_oea.c
+++ b/src/PJ_oea.c
@@ -95,7 +95,7 @@ PJ *PROJECTION(oea) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_oea_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_omerc.c b/src/PJ_omerc.c
index 5dd9c20a..de4a2c39 100644
--- a/src/PJ_omerc.c
+++ b/src/PJ_omerc.c
@@ -237,7 +237,7 @@ PJ *PROJECTION(omerc) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_omerc_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_ortho.c b/src/PJ_ortho.c
index 783777c0..a6527e72 100644
--- a/src/PJ_ortho.c
+++ b/src/PJ_ortho.c
@@ -129,7 +129,7 @@ PJ *PROJECTION(ortho) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_ortho_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_patterson.c b/src/PJ_patterson.c
index f3a18423..50ca0981 100644
--- a/src/PJ_patterson.c
+++ b/src/PJ_patterson.c
@@ -122,7 +122,7 @@ PJ *PROJECTION(patterson) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_patterson_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_poly.c b/src/PJ_poly.c
index 50c0ee5f..e2ecdd89 100644
--- a/src/PJ_poly.c
+++ b/src/PJ_poly.c
@@ -157,7 +157,7 @@ PJ *PROJECTION(poly) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_poly_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_putp2.c b/src/PJ_putp2.c
index 4c5a417a..052d95bb 100644
--- a/src/PJ_putp2.c
+++ b/src/PJ_putp2.c
@@ -70,7 +70,7 @@ PJ *PROJECTION(putp2) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_putp2_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_putp3.c b/src/PJ_putp3.c
index 26fc0a90..93720915 100644
--- a/src/PJ_putp3.c
+++ b/src/PJ_putp3.c
@@ -80,7 +80,7 @@ PJ *PROJECTION(putp3p) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_putp3_selftest (void) {return 0;}
 #else
 
@@ -125,7 +125,7 @@ int pj_putp3_selftest (void) {
 #endif
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_putp3p_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_putp4p.c b/src/PJ_putp4p.c
index 9264d896..f8b65cee 100644
--- a/src/PJ_putp4p.c
+++ b/src/PJ_putp4p.c
@@ -87,7 +87,7 @@ PJ *PROJECTION(weren) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_putp4p_selftest (void) {return 0;}
 #else
 
@@ -132,7 +132,7 @@ int pj_putp4p_selftest (void) {
 #endif
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_weren_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_putp5.c b/src/PJ_putp5.c
index d4e59ee8..87b7af74 100644
--- a/src/PJ_putp5.c
+++ b/src/PJ_putp5.c
@@ -84,7 +84,7 @@ PJ *PROJECTION(putp5p) {
     return P;
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_putp5_selftest (void) {return 0;}
 #else
 
@@ -128,7 +128,7 @@ int pj_putp5_selftest (void) {
 #endif
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_putp5p_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_putp6.c b/src/PJ_putp6.c
index 7c860cdb..6c4fc246 100644
--- a/src/PJ_putp6.c
+++ b/src/PJ_putp6.c
@@ -108,7 +108,7 @@ PJ *PROJECTION(putp6p) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_putp6_selftest (void) {return 0;}
 #else
 
@@ -152,7 +152,7 @@ int pj_putp6_selftest (void) {
 #endif
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_putp6p_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_qsc.c b/src/PJ_qsc.c
index e02369ae..2777736b 100644
--- a/src/PJ_qsc.c
+++ b/src/PJ_qsc.c
@@ -411,7 +411,7 @@ PJ *PROJECTION(qsc) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_qsc_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_robin.c b/src/PJ_robin.c
index 22378305..f6996313 100644
--- a/src/PJ_robin.c
+++ b/src/PJ_robin.c
@@ -151,7 +151,7 @@ PJ *PROJECTION(robin) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_robin_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_rpoly.c b/src/PJ_rpoly.c
index ad240917..d0ff8319 100644
--- a/src/PJ_rpoly.c
+++ b/src/PJ_rpoly.c
@@ -68,7 +68,7 @@ PJ *PROJECTION(rpoly) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_rpoly_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_sconics.c b/src/PJ_sconics.c
index 1d85b0a9..df7fb661 100644
--- a/src/PJ_sconics.c
+++ b/src/PJ_sconics.c
@@ -223,7 +223,7 @@ PJ *PROJECTION(vitk1) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_euler_selftest (void) {return 0;}
 #else
 
@@ -287,7 +287,7 @@ int pj_euler_selftest (void) {
 
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_murd1_selftest (void) {return 0;}
 #else
 
@@ -359,7 +359,7 @@ int pj_murd1_selftest (void) {
 
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_murd2_selftest (void) {return 0;}
 #else
 
@@ -427,7 +427,7 @@ int pj_murd2_selftest (void) {
 
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_murd3_selftest (void) {return 0;}
 #else
 
@@ -496,7 +496,7 @@ int pj_murd3_selftest (void) {
 
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_pconic_selftest (void) {return 0;}
 #else
 
@@ -569,7 +569,7 @@ int pj_pconic_selftest (void) {
 
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_tissot_selftest (void) {return 0;}
 #else
 
@@ -635,7 +635,7 @@ int pj_tissot_selftest (void) {
 
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_vitk1_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_somerc.c b/src/PJ_somerc.c
index 380fbf5d..22ee5f5c 100644
--- a/src/PJ_somerc.c
+++ b/src/PJ_somerc.c
@@ -105,7 +105,7 @@ PJ *PROJECTION(somerc) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_somerc_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_stere.c b/src/PJ_stere.c
index 762e55ea..cc1773da 100644
--- a/src/PJ_stere.c
+++ b/src/PJ_stere.c
@@ -301,7 +301,7 @@ PJ *PROJECTION(ups) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_stere_selftest (void) {return 0;}
 #else
 
@@ -364,7 +364,7 @@ int pj_stere_selftest (void) {
 
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_ups_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_sterea.c b/src/PJ_sterea.c
index 93799011..1b912316 100644
--- a/src/PJ_sterea.c
+++ b/src/PJ_sterea.c
@@ -118,7 +118,7 @@ PJ *PROJECTION(sterea) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_sterea_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_sts.c b/src/PJ_sts.c
index 347a7303..b6b6dc43 100644
--- a/src/PJ_sts.c
+++ b/src/PJ_sts.c
@@ -87,7 +87,7 @@ PJ *PROJECTION(fouc) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_fouc_selftest (void) {return 0;}
 #else
 int pj_fouc_selftest (void) {
@@ -158,7 +158,7 @@ PJ *PROJECTION(kav5) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_kav5_selftest (void) {return 0;}
 #else
 int pj_kav5_selftest (void) {
@@ -226,7 +226,7 @@ PJ *PROJECTION(qua_aut) {
     return setup(P, 2., 2., 0);
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_qua_aut_selftest (void) {return 0;}
 #else
 int pj_qua_aut_selftest (void) {
@@ -294,7 +294,7 @@ PJ *PROJECTION(mbt_s) {
     return setup(P, 1.48875, 1.36509, 0);
 }
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_mbt_s_selftest (void) {return 0;}
 #else
 int pj_mbt_s_selftest (void) {
diff --git a/src/PJ_tcc.c b/src/PJ_tcc.c
index 457924c0..316d5e50 100644
--- a/src/PJ_tcc.c
+++ b/src/PJ_tcc.c
@@ -37,7 +37,7 @@ PJ *PROJECTION(tcc) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_tcc_selftest (void) {return 0;}
 #else
 int pj_tcc_selftest (void) {
diff --git a/src/PJ_tcea.c b/src/PJ_tcea.c
index 7b469d0e..d219928d 100644
--- a/src/PJ_tcea.c
+++ b/src/PJ_tcea.c
@@ -43,7 +43,7 @@ PJ *PROJECTION(tcea) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_tcea_selftest (void) {return 0;}
 #else
 int pj_tcea_selftest (void) {
diff --git a/src/PJ_times.c b/src/PJ_times.c
index 26d5e41c..5d3b0391 100644
--- a/src/PJ_times.c
+++ b/src/PJ_times.c
@@ -90,7 +90,7 @@ PJ *PROJECTION(times) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_times_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_tmerc.c b/src/PJ_tmerc.c
index ab77f4d7..edae80fd 100644
--- a/src/PJ_tmerc.c
+++ b/src/PJ_tmerc.c
@@ -195,7 +195,7 @@ PJ *PROJECTION(tmerc) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_tmerc_selftest (void) {return 0;}
 #else
 int pj_tmerc_selftest (void) {
diff --git a/src/PJ_tpeqd.c b/src/PJ_tpeqd.c
index e8bf8e19..1b289a0b 100644
--- a/src/PJ_tpeqd.c
+++ b/src/PJ_tpeqd.c
@@ -117,7 +117,7 @@ PJ *PROJECTION(tpeqd) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_tpeqd_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_urm5.c b/src/PJ_urm5.c
index 7a759b07..f19d5c43 100644
--- a/src/PJ_urm5.c
+++ b/src/PJ_urm5.c
@@ -53,7 +53,7 @@ PJ *PROJECTION(urm5) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_urm5_selftest (void) {return 0;}
 #else
 int pj_urm5_selftest (void) {
diff --git a/src/PJ_urmfps.c b/src/PJ_urmfps.c
index 2322aa04..ff775c25 100644
--- a/src/PJ_urmfps.c
+++ b/src/PJ_urmfps.c
@@ -81,7 +81,7 @@ PJ *PROJECTION(wag1) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_urmfps_selftest (void) {return 0;}
 #else
 int pj_urmfps_selftest (void) {
@@ -123,7 +123,7 @@ int pj_urmfps_selftest (void) {
 #endif
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_wag1_selftest (void) {return 0;}
 #else
 int pj_wag1_selftest (void) {
diff --git a/src/PJ_vandg.c b/src/PJ_vandg.c
index e760375f..18d75f12 100644
--- a/src/PJ_vandg.c
+++ b/src/PJ_vandg.c
@@ -111,7 +111,7 @@ PJ *PROJECTION(vandg) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_vandg_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_vandg2.c b/src/PJ_vandg2.c
index 80da42c2..fac7e85d 100644
--- a/src/PJ_vandg2.c
+++ b/src/PJ_vandg2.c
@@ -87,7 +87,7 @@ PJ *PROJECTION(vandg3) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_vandg2_selftest (void) {return 0;}
 #else
 
@@ -117,7 +117,7 @@ int pj_vandg2_selftest (void) {
 
 #endif
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_vandg3_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_vandg4.c b/src/PJ_vandg4.c
index ca079000..2dbb0713 100644
--- a/src/PJ_vandg4.c
+++ b/src/PJ_vandg4.c
@@ -66,7 +66,7 @@ PJ *PROJECTION(vandg4) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_vandg4_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_wag2.c b/src/PJ_wag2.c
index b70dcd4f..9a41ab63 100644
--- a/src/PJ_wag2.c
+++ b/src/PJ_wag2.c
@@ -43,7 +43,7 @@ PJ *PROJECTION(wag2) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_wag2_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_wag3.c b/src/PJ_wag3.c
index 0539f4a1..cd6c18e9 100644
--- a/src/PJ_wag3.c
+++ b/src/PJ_wag3.c
@@ -56,7 +56,7 @@ PJ *PROJECTION(wag3) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_wag3_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_wag7.c b/src/PJ_wag7.c
index 847566d8..d24f4e1a 100644
--- a/src/PJ_wag7.c
+++ b/src/PJ_wag7.c
@@ -38,7 +38,7 @@ PJ *PROJECTION(wag7) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_wag7_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_wink1.c b/src/PJ_wink1.c
index f9d127c0..320a4fb6 100644
--- a/src/PJ_wink1.c
+++ b/src/PJ_wink1.c
@@ -55,7 +55,7 @@ PJ *PROJECTION(wink1) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_wink1_selftest (void) {return 0;}
 #else
 
diff --git a/src/PJ_wink2.c b/src/PJ_wink2.c
index 5f2b44a7..4b82e423 100644
--- a/src/PJ_wink2.c
+++ b/src/PJ_wink2.c
@@ -63,7 +63,7 @@ PJ *PROJECTION(wink2) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_wink2_selftest (void) {return 0;}
 #else
 
diff --git a/src/pj_geocent.c b/src/pj_geocent.c
index fa01b01f..a00fc991 100644
--- a/src/pj_geocent.c
+++ b/src/pj_geocent.c
@@ -72,7 +72,7 @@ PJ *PROJECTION(geocent) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_geocent_selftest (void) {return 0;}
 #else
 
diff --git a/src/pj_run_selftests.c b/src/pj_run_selftests.c
index cede4961..c0d59f73 100644
--- a/src/pj_run_selftests.c
+++ b/src/pj_run_selftests.c
@@ -48,7 +48,7 @@ static void run_one_test (const char *mnemonic, int (testfunc)(void), int verbos
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_run_selftests (int verbosity) {
     printf ("This version of libproj is not configured for internal regression tests.\n");
     return 0;
diff --git a/src/proj_etmerc.c b/src/proj_etmerc.c
index 61ba41aa..aed1499e 100644
--- a/src/proj_etmerc.c
+++ b/src/proj_etmerc.c
@@ -348,7 +348,7 @@ PJ *PROJECTION(etmerc) {
 
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_etmerc_selftest (void) {return 0;}
 #else
 
@@ -433,7 +433,7 @@ PJ *PROJECTION(utm) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_utm_selftest (void) {return 0;}
 #else
 
diff --git a/src/proj_rouss.c b/src/proj_rouss.c
index fc9918be..264b1b77 100644
--- a/src/proj_rouss.c
+++ b/src/proj_rouss.c
@@ -153,7 +153,7 @@ PJ *PROJECTION(rouss) {
 }
 
 
-#ifdef PJ_OMIT_SELFTEST
+#ifndef PJ_SELFTEST
 int pj_rouss_selftest (void) {return 0;}
 #else
 
diff --git a/src/projects.h b/src/projects.h
index ced5a4f0..5b883133 100644
--- a/src/projects.h
+++ b/src/projects.h
@@ -36,6 +36,8 @@
 #  ifndef _CRT_NONSTDC_NO_DEPRECATE
 #    define _CRT_NONSTDC_NO_DEPRECATE
 #  endif
+/* enable predefined math constants M_* for MS Visual Studio workaround */
+#  define _USE_MATH_DEFINES
 #endif
 
 /* standard inclusions */
@@ -93,11 +95,6 @@ extern double hypot(double, double);
 #  define hypot _hypot
 #endif
 
-/* enable predefined math constants M_* for MS Visual Studio workaround */
-#ifdef _MSC_VER
-#define _USE_MATH_DEFINES
-#endif
-
 /* If we still haven't got M_PI*, we rely on our own defines.
  * For example, this is necessary when compiling with gcc and
  * the -ansi flag.