[Proj] 4.9.1RC1 Released

[Charles Karney]

On 02/20/2015 10:48 PM, Howard Butler wrote:
> As requested, I have issued one more RC, with the items from Markus, Sebastiaan, and Charles. Please report any findings or issues as before.
>
> http://download.osgeo.org/proj/proj-4.9.1RC2.tar.gz
>
> Thanks,

Please apply the following patches to proj-4.9.1RC2 (in addition to
including man/CMakeLists.txt and cmake/policies.cmake as noted by Even).
These patches fix:

src/bin_nad2bin.cmake:
   backward test for nad2nad warning
   bad directory specified for emess.c

src/lib_proj.cmake:
   remove space from variable name to suppress policy warning

src/PJ_aitoff.c
   define M_PI and M_PI_2 (needed for Windows)

src/pj_gridinfo.c
   remove trailing / from preprocessor line

Here are the patches...

diff -ru proj-4.9.1RC2/src/bin_nad2bin.cmake 
proj-4.9.1RC2-patch/src/bin_nad2bin.cmake
--- proj-4.9.1RC2/src/bin_nad2bin.cmake	2015-02-20 16:20:34.000000000 -0500
+++ proj-4.9.1RC2-patch/src/bin_nad2bin.cmake	2015-02-21 
07:54:38.958834751 -0500
@@ -1,12 +1,12 @@
-if(WIN32 AND NOT BUILD_LIBPROJ_SHARED)
+if(WIN32 AND BUILD_LIBPROJ_SHARED)
      message(warning " nad2nad can't be build with a DLL proj4 library 
you need a static lib")
-endif(WIN32 AND NOT BUILD_LIBPROJ_SHARED)
+endif(WIN32 AND BUILD_LIBPROJ_SHARED)


  set(NAD2BIN_SRC nad2bin.c)
  source_group("Source Files\\Bin" FILES ${NAD2BIN_SRC})
  if(WIN32)
-    set(NAD2BIN_SRC ${NAD2BIN_SRC} ${NAD2BIN_SRC}/emess.c)
+    set(NAD2BIN_SRC ${NAD2BIN_SRC} emess.c)
  endif(WIN32)

  #Executable
diff -ru proj-4.9.1RC2/src/lib_proj.cmake 
proj-4.9.1RC2-patch/src/lib_proj.cmake
--- proj-4.9.1RC2/src/lib_proj.cmake	2015-02-20 22:46:19.000000000 -0500
+++ proj-4.9.1RC2-patch/src/lib_proj.cmake	2015-02-21 07:53:22.472682833 
-0500
@@ -259,7 +259,7 @@
    set_target_properties(${PROJ_CORE_TARGET}
      PROPERTIES
      OUTPUT_NAME "${PROJ_CORE_TARGET_OUTPUT_NAME}"
-    VERSION  ${${PROJECT_INTERN_NAME}_VERSION }
+    VERSION  ${${PROJECT_INTERN_NAME}_VERSION}
      CLEAN_DIRECT_OUTPUT 1)
  elseif(BUILD_FRAMEWORKS_AND_BUNDLE)
    set_target_properties(${PROJ_CORE_TARGET}
diff -ru proj-4.9.1RC2/src/PJ_aitoff.c proj-4.9.1RC2-patch/src/PJ_aitoff.c
--- proj-4.9.1RC2/src/PJ_aitoff.c	2015-02-20 16:20:34.000000000 -0500
+++ proj-4.9.1RC2-patch/src/PJ_aitoff.c	2015-02-21 07:57:51.465926362 -0500
@@ -34,6 +34,13 @@
  #define PJ_LIB__
  #include <projects.h>

+#ifndef M_PI
+#  define M_PI 3.14159265358979323846
+#endif
+#ifndef M_PI_2
+#  define M_PI_2 1.57079632679489661923
+#endif
+
  PJ_CVSID("$Id: PJ_aitoff.c 2609 2015-02-17 17:05:09Z hobu $");

  PROJ_HEAD(aitoff, "Aitoff") "\n\tMisc Sph";
diff -ru proj-4.9.1RC2/src/pj_gridinfo.c 
proj-4.9.1RC2-patch/src/pj_gridinfo.c
--- proj-4.9.1RC2/src/pj_gridinfo.c	2015-02-20 16:20:34.000000000 -0500
+++ proj-4.9.1RC2-patch/src/pj_gridinfo.c	2015-02-21 07:48:14.915962953 
-0500
@@ -41,7 +41,7 @@
   * TODO - mloskot: re-implement porting friendly assert
   */
  # define assert(exp)	((void)0)
-#else/
+#else
  # include <assert.h>
  #endif /* _WIN32_WCE */