Attachment 580233 Details for Bug 816282 – switch to proj_api.h

[patch] switch to proj_api.h

ogdi-3.2.0.beta2-proj.patch (text/plain), 3.78 KB, created by Dan Horák on 2012-04-25 18:24:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Horák

Created: 2012-04-25 18:24:03 UTC

Size: 3.78 KB

patch

obsolete

>diff -up ogdi-3.2.0.beta2/configure.in.proj ogdi-3.2.0.beta2/configure.in
>--- ogdi-3.2.0.beta2/configure.in.proj	2012-04-25 20:13:49.000000000 +0200
>+++ ogdi-3.2.0.beta2/configure.in	2012-04-25 20:14:47.000000000 +0200
>@@ -81,13 +81,13 @@ AC_ARG_WITH(proj,[  --with-proj[=ARG]
> if test "$with_proj" = "yes" ; then
> 
>   AC_CHECK_LIB(proj,pj_init,PROJ_SETTING=external,PROJ_SETTING=missing,)
>-  AC_CHECK_HEADERS(projects.h)
>+  AC_CHECK_HEADERS(proj_api.h)
> 
>   if test $PROJ_SETTING = missing ; then
>     AC_MSG_ERROR([Unable to find external PROJ.4 library, give path or use default internal library.])
>   fi
>   if test "$ac_cv_header_projects_h" = no ; then
>-    AC_MSG_ERROR([Unable to find external PROJ.4 projects.h file, give path or use default internal library.])
>+    AC_MSG_ERROR([Unable to find external PROJ.4 proj_api.h file, give path or use default internal library.])
>   fi
> 
>   PROJ_SETTING=external
>@@ -95,11 +95,11 @@ if test "$with_proj" = "yes" ; then
> 
> elif test "$with_proj" != "no" -a "$with_proj" != "" ; then
>   
>-  if test -r $with_proj/include/projects.h ; then
>-    echo "checking for $with_proj/include/projects.h ... found"
>+  if test -r $with_proj/include/projapi.h ; then
>+    echo "checking for $with_proj/include/proj_api.h ... found"
>     PROJ_INCLUDE=-I$with_proj/include
>   else
>-    AC_MSG_ERROR([Unable to find $with_proj/include/projects.h])
>+    AC_MSG_ERROR([Unable to find $with_proj/include/proj_api.h])
>   fi
> 
>   if test -r $with_proj/lib/libproj.so ; then
>diff -up ogdi-3.2.0.beta2/configure.proj ogdi-3.2.0.beta2/configure
>--- ogdi-3.2.0.beta2/configure.proj	2012-04-25 20:13:53.000000000 +0200
>+++ ogdi-3.2.0.beta2/configure	2012-04-25 20:15:21.000000000 +0200
>@@ -3939,7 +3939,7 @@ else
> fi
> 
> 
>-for ac_header in projects.h
>+for ac_header in proj_api.h
> do
> as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
> if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
>@@ -4085,8 +4085,8 @@ echo "$as_me: error: Unable to find exte
>    { (exit 1); exit 1; }; }
>   fi
>   if test "$ac_cv_header_projects_h" = no ; then
>-    { { echo "$as_me:$LINENO: error: Unable to find external PROJ.4 projects.h file, give path or use default internal library." >&5
>-echo "$as_me: error: Unable to find external PROJ.4 projects.h file, give path or use default internal library." >&2;}
>+    { { echo "$as_me:$LINENO: error: Unable to find external PROJ.4 proj_api.h file, give path or use default internal library." >&5
>+echo "$as_me: error: Unable to find external PROJ.4 proj_api.h file, give path or use default internal library." >&2;}
>    { (exit 1); exit 1; }; }
>   fi
> 
>@@ -4095,12 +4095,12 @@ echo "$as_me: error: Unable to find exte
> 
> elif test "$with_proj" != "no" -a "$with_proj" != "" ; then
> 
>-  if test -r $with_proj/include/projects.h ; then
>-    echo "checking for $with_proj/include/projects.h ... found"
>+  if test -r $with_proj/include/proj_api.h ; then
>+    echo "checking for $with_proj/include/proj_api.h ... found"
>     PROJ_INCLUDE=-I$with_proj/include
>   else
>-    { { echo "$as_me:$LINENO: error: Unable to find $with_proj/include/projects.h" >&5
>-echo "$as_me: error: Unable to find $with_proj/include/projects.h" >&2;}
>+    { { echo "$as_me:$LINENO: error: Unable to find $with_proj/include/proj_api.h" >&5
>+echo "$as_me: error: Unable to find $with_proj/include/proj_api.h" >&2;}
>    { (exit 1); exit 1; }; }
>   fi
> 
>diff -up ogdi-3.2.0.beta2/ogdi/include/ecs_util.h.proj ogdi-3.2.0.beta2/ogdi/include/ecs_util.h
>--- ogdi-3.2.0.beta2/ogdi/include/ecs_util.h.proj	2012-04-25 20:04:58.000000000 +0200
>+++ ogdi-3.2.0.beta2/ogdi/include/ecs_util.h	2012-04-25 20:05:06.000000000 +0200
>@@ -105,7 +105,7 @@
> #include <sys/types.h>
> #include <sys/stat.h>
> 
>-#include "projects.h"
>+#include "proj_api.h"
> 
> /* Ensure we are compatible with PROJ.4.4.x and PROJ.4.3.x */
> #ifndef USE_PROJUV

Actions: View | Diff

Attachments on bug 816282: 580233 | 580250 | 589954