[postgis-tickets] r17549 - Revert r17538

[Raul]

Author: algunenano
Date: 2019-06-19 09:57:22 -0700 (Wed, 19 Jun 2019)
New Revision: 17549

Modified:
   trunk/configure.ac
Log:
Revert r17538

Some of the bots didn't like it



Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2019-06-19 15:26:37 UTC (rev 17548)
+++ trunk/configure.ac	2019-06-19 16:57:22 UTC (rev 17549)
@@ -868,6 +868,18 @@
             ])
 fi
 
+
+dnl Check that we can find the proj_api.h header file
+CPPFLAGS_SAVE="$CPPFLAGS"
+CPPFLAGS="$PROJ_CPPFLAGS"
+AC_CHECK_HEADER([proj_api.h],
+	[],
+	[AC_CHECK_HEADER([proj.h],
+		[],
+		[AC_MSG_ERROR([could not find proj.h or proj_api.h - you may need to specify the directory of a PROJ installation using --with-projdir])]
+		)]
+	)
+
 dnl Return the PROJ.4 version number
 AC_PROJ_VERSION([POSTGIS_PROJ_VERSION])
 AC_DEFINE_UNQUOTED([POSTGIS_PROJ_VERSION], [$POSTGIS_PROJ_VERSION], [PROJ library version])
@@ -879,20 +891,6 @@
 	AC_MSG_ERROR([PostGIS requires PROJ >= 4.6.0])
 fi
 
-dnl Check that we can find proj headers
-CPPFLAGS_SAVE="$CPPFLAGS"
-CPPFLAGS="$PROJ_CPPFLAGS"
-if test ! "$POSTGIS_PROJ_VERSION" -ge 60; then
-	AC_CHECK_HEADER([proj_api.h],
-		[],
-		[AC_MSG_ERROR([could not find proj.h or proj_api.h - you may need to specify the directory of a PROJ installation using --with-projdir])]
-	)
-else
-	AC_CHECK_HEADER([proj.h],
-		[],
-		[AC_MSG_ERROR([could not find proj.h or proj_api.h - you may need to specify the directory of a PROJ installation using --with-projdir])]
-        )
-fi
 AC_SUBST([PROJ_CPPFLAGS])
 AC_SUBST([PROJ_LDFLAGS])