Commit a1d39cd7 authored by Oliver Heidmann's avatar Oliver Heidmann
Browse files

added required flag for proj to comiple with old (depricated) headers

parent 956fa903
......@@ -418,9 +418,12 @@ AC_ARG_WITH([proj],
[no],[AC_MSG_CHECKING([for proj library])
AC_MSG_RESULT([suppressed])],
[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_DEFINE(DACCEPT_USE_OF_DEPRECATED_PROJ_API_H)
AC_SEARCH_LIBS([pj_init],[proj],[
AC_DEFINE([HAVE_LIBPROJ],[1],[Define to 1 for PROJ support]),
AC_DEFINE(DACCEPT_USE_OF_DEPRECATED_PROJ_API_H,[1],[Enable use of depricated proj_api]) ],
[AC_MSG_ERROR([Could not link to PROJ library!])])
AC_SUBST([PROJ_LDFLAGS],[" -lproj"])
AC_SUBST([PROJ_LDFLAGS],[" -lproj "])
AC_SUBST([PROJ_INCLUDE],[""])],
[*],[PROJ_ROOT=$with_proj
AS_IF([test -d "$PROJ_ROOT"],
......@@ -429,7 +432,8 @@ AC_ARG_WITH([proj],
AC_CHECK_HEADERS([proj_api.h])
AC_SEARCH_LIBS([pj_init],
[proj],
[AC_DEFINE([HAVE_LIBPROJ],[1],[Define to 1 for PROJ support])],
[AC_DEFINE([HAVE_LIBPROJ],[1],[Define to 1 for PROJ support]),
AC_DEFINE(ACCEPT_USE_OF_DEPRECATED_PROJ_API_H,[1],[Enable use of depricated proj_api]) ],
[AC_MSG_ERROR([Could not link to PROJ library!])])
AC_SUBST([PROJ_LDFLAGS],[" -L$PROJ_ROOT/lib -lproj"])
AC_SUBST([PROJ_INCLUDE],[" -I$PROJ_ROOT/include"])],
......
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