Commit 2e3038b3 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

PROJ.4: use proj_api.h instead of projects.h

parent 9ebf837b
......@@ -3,6 +3,10 @@
* using CDI library version 1.5.9
* Version 1.5.9 released
2012-12-06 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* PROJ.4: use proj_api.h instead of projects.h
2012-11-27 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* gradsdes: use pstreamInqByteorder() [Bug #3041]
......
......@@ -18307,12 +18307,12 @@ $as_echo_n "checking for proj library... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
$as_echo "suppressed" >&6; } ;; #(
yes) :
for ac_header in projects.h
for ac_header in proj_api.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "projects.h" "ac_cv_header_projects_h" "$ac_includes_default"
if test "x$ac_cv_header_projects_h" = xyes; then :
ac_fn_c_check_header_mongrel "$LINENO" "proj_api.h" "ac_cv_header_proj_api_h" "$ac_includes_default"
if test "x$ac_cv_header_proj_api_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PROJECTS_H 1
#define HAVE_PROJ_API_H 1
_ACEOF
 
fi
......@@ -18388,12 +18388,12 @@ fi
if test -d "$PROJ_ROOT"; then :
LDFLAGS="-L$PROJ_ROOT/lib $LDFLAGS"
CPPFLAGS="-I$PROJ_ROOT/include $CPPFLAGS"
for ac_header in projects.h
for ac_header in proj_api.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "projects.h" "ac_cv_header_projects_h" "$ac_includes_default"
if test "x$ac_cv_header_projects_h" = xyes; then :
ac_fn_c_check_header_mongrel "$LINENO" "proj_api.h" "ac_cv_header_proj_api_h" "$ac_includes_default"
if test "x$ac_cv_header_proj_api_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PROJECTS_H 1
#define HAVE_PROJ_API_H 1
_ACEOF
 
fi
......
......@@ -319,7 +319,7 @@ AC_ARG_WITH([proj],
[AS_CASE(["$with_proj"],
[no],[AC_MSG_CHECKING([for proj library])
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([projects.h])
[yes],[AC_CHECK_HEADERS([proj_api.h])
AC_SEARCH_LIBS([pj_init],[proj],[AC_DEFINE([HAVE_LIBPROJ],[1],[Define to 1 for PROJ support])],
[AC_MSG_ERROR([Could not link to PROJ library!])])
AC_SUBST([PROJ_LDFLAGS],[" -lproj"])
......@@ -328,7 +328,7 @@ AC_ARG_WITH([proj],
AS_IF([test -d "$PROJ_ROOT"],
[LDFLAGS="-L$PROJ_ROOT/lib $LDFLAGS"
CPPFLAGS="-I$PROJ_ROOT/include $CPPFLAGS"
AC_CHECK_HEADERS([projects.h])
AC_CHECK_HEADERS([proj_api.h])
AC_SEARCH_LIBS([pj_init],
[proj],
[AC_DEFINE([HAVE_LIBPROJ],[1],[Define to 1 for PROJ support])],
......
......@@ -121,8 +121,8 @@
/* Define to 1 if you have the <netcdf.h> header file. */
#undef HAVE_NETCDF_H
/* Define to 1 if you have the <projects.h> header file. */
#undef HAVE_PROJECTS_H
/* Define to 1 if you have the <proj_api.h> header file. */
#undef HAVE_PROJ_API_H
/* Define if you have POSIX threads libraries and header files. */
#undef HAVE_PTHREAD
......
......@@ -22,7 +22,7 @@
#include <stdarg.h> /* va_list */
#if defined (HAVE_LIBPROJ)
# include "projects.h"
# include "proj_api.h"
#endif
#include <cdi.h>
......@@ -354,7 +354,7 @@ static
void sinusoidal_to_geo(int gridsize, double *xvals, double *yvals)
{
#if defined (HAVE_LIBPROJ)
PJ *libProj;
projPJ *libProj;
char *params[20];
int nbpar=0;
projUV data, res;
......@@ -391,7 +391,7 @@ static
void laea_to_geo(int gridID, int gridsize, double *xvals, double *yvals)
{
#if defined (HAVE_LIBPROJ)
PJ *libProj;
projPJ *libProj;
char *params[20];
int nbpar=0;
projUV data, res;
......@@ -435,7 +435,7 @@ static
void lcc2_to_geo(int gridID, int gridsize, double *xvals, double *yvals)
{
#if defined (HAVE_LIBPROJ)
PJ *libProj;
projPJ *libProj;
char *params[20];
int nbpar=0;
projUV data, res;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment