Commit 9f21f983 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

disable proj4 configuration (not used)

parent 0498b8d8
......@@ -190,8 +190,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PROJ_INCLUDE = @PROJ_INCLUDE@
PROJ_LDFLAGS = @PROJ_LDFLAGS@
PYTHON = @PYTHON@
RANLIB = @RANLIB@
RUBY = @RUBY@
......
......@@ -169,8 +169,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PROJ_INCLUDE = @PROJ_INCLUDE@
PROJ_LDFLAGS = @PROJ_LDFLAGS@
PYTHON = @PYTHON@
RANLIB = @RANLIB@
RUBY = @RUBY@
......
......@@ -47,7 +47,6 @@ case "${HOSTNAME}" in
--with-netcdf=$HOME/src/cdo/branches/libs4cdo/build-split/netcdf-4.1.1 \
--with-hdf5=$HOME/src/cdo/branches/libs4cdo/build-split/hdf5-1.8.4 \
--with-szlib=$HOME/src/cdo/branches/libs4cdo/build-split/szip-2.1 \
--with-proj=$HOME/src/cdo/branches/libs4cdo/build-split/proj-4.6.1 \
CC=gcc CFLAGS="-g -O2 -Wall"
;;
# sparc-sun-solaris2.9
......@@ -79,17 +78,16 @@ case "${HOSTNAME}" in
# 5000-fujitsu-uxpv4.1_ES
vpp5)
./configure --prefix=$HOME \
--with-netcdf=$HOME/PROJ \
CC=vcc CFLAGS="-O -Wv,-m3 -K4"
;;
# powerpc-ibm-aix6.1.0.0
blizzard*)
./configure --prefix=$HOME/local \
--with-netcdf=/sw/aix61/netcdf-4.1.1-rc2 \
--with-hdf5=/sw/aix61/hdf5-1.8.4-patch1-threadsafe \
--with-zlib=/sw/aix53/zlib-1.2.3 --with-szlib=/sw/aix53/szip-2.1 \
AR="ar -X 64" LDFLAGS="-brtl" FC=xlf_r\
CC=xlc_r CFLAGS="-g -O3 -q64 -qhot -qarch=auto -qtune=auto -DHAVE_MMAP -Dextname"
--with-netcdf=/sw/aix61/netcdf-4.1.1-rc2 \
--with-hdf5=/sw/aix61/hdf5-1.8.4-patch1-threadsafe \
--with-zlib=/sw/aix53/zlib-1.2.3 --with-szlib=/sw/aix53/szip-2.1 \
AR="ar -X 64" LDFLAGS="-brtl" FC=xlf_r\
CC=xlc_r CFLAGS="-g -O3 -q64 -qhot -qarch=auto -qtune=auto -DHAVE_MMAP -Dextname"
;;
*)
echo "configuration for hostname $HOSTNAME not found!"
......
......@@ -630,8 +630,6 @@ ENABLE_ALL_STATIC_TRUE
ENABLE_CDI_LIB
ENABLE_CDI_LIB_FALSE
ENABLE_CDI_LIB_TRUE
PROJ_INCLUDE
PROJ_LDFLAGS
ENABLE_IEG
ENABLE_EXTRA
ENABLE_SERVICE
......@@ -798,7 +796,6 @@ enable_cgribex
enable_service
enable_extra
enable_ieg
with_proj
enable_all_static
enable_mpi
enable_iso_c_interface
......@@ -1496,8 +1493,6 @@ Optional Packages:
library for grib2 compression; if a directory is
given, it will be used as a value for
--with-jasper-root
--with-proj=<directory> Specify location of PROJ library for cartographic
projections.
 
Some influential environment variables:
CC C compiler command
......@@ -23492,186 +23487,31 @@ ENABLE_IEG=$enable_ieg
 
# ----------------------------------------------------------------------
# Checks for PROJ.4 library
# Check whether --with-proj was given.
if test "${with_proj+set}" = set; then :
withval=$with_proj; case "$with_proj" in #(
no) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for proj library" >&5
$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
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" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PROJECTS_H 1
_ACEOF
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pj_init" >&5
$as_echo_n "checking for library containing pj_init... " >&6; }
if test "${ac_cv_search_pj_init+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char pj_init ();
int
main ()
{
return pj_init ();
;
return 0;
}
_ACEOF
for ac_lib in '' proj; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_pj_init=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if test "${ac_cv_search_pj_init+set}" = set; then :
break
fi
done
if test "${ac_cv_search_pj_init+set}" = set; then :
else
ac_cv_search_pj_init=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pj_init" >&5
$as_echo "$ac_cv_search_pj_init" >&6; }
ac_res=$ac_cv_search_pj_init
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIBPROJ 1" >>confdefs.h
else
as_fn_error $? "Could not link to PROJ library!" "$LINENO" 5
fi
PROJ_LDFLAGS=" -lproj"
PROJ_INCLUDE=""
;; #(
*) :
PROJ_ROOT=$with_proj
if test -d "$PROJ_ROOT"; then :
LDFLAGS="$LDFLAGS -L$PROJ_ROOT/lib"
CPPFLAGS="$CPPFLAGS -I$PROJ_ROOT/include"
for ac_header in projects.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" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PROJECTS_H 1
_ACEOF
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pj_init" >&5
$as_echo_n "checking for library containing pj_init... " >&6; }
if test "${ac_cv_search_pj_init+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char pj_init ();
int
main ()
{
return pj_init ();
;
return 0;
}
_ACEOF
for ac_lib in '' proj; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_pj_init=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if test "${ac_cv_search_pj_init+set}" = set; then :
break
fi
done
if test "${ac_cv_search_pj_init+set}" = set; then :
else
ac_cv_search_pj_init=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pj_init" >&5
$as_echo "$ac_cv_search_pj_init" >&6; }
ac_res=$ac_cv_search_pj_init
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_LIBPROJ 1" >>confdefs.h
else
as_fn_error $? "Could not link to PROJ library!" "$LINENO" 5
fi
PROJ_LDFLAGS=" -L$PROJ_ROOT/lib -lproj"
PROJ_INCLUDE=" -I$PROJ_ROOT/include"
else
as_fn_error $? "$PROJ_ROOT is not a directory! PROJ suppressed" "$LINENO" 5
fi ;; #(
*) :
;;
esac
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the PROJ library" >&5
$as_echo_n "checking for the PROJ library... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
$as_echo "suppressed" >&6; }
fi
# AC_ARG_WITH([proj],
# [AS_HELP_STRING([--with-proj=<directory>],
# [Specify location of PROJ library for cartographic projections.])],
# [AS_CASE(["$with_proj"],
# [no],[AC_MSG_CHECKING([for proj library])
# AC_MSG_RESULT([suppressed])],
# [yes],[AC_CHECK_HEADERS([projects.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"])
# AC_SUBST([PROJ_INCLUDE],[""])],
# [*],[PROJ_ROOT=$with_proj
# AS_IF([test -d "$PROJ_ROOT"],
# [LDFLAGS="$LDFLAGS -L$PROJ_ROOT/lib"
# CPPFLAGS="$CPPFLAGS -I$PROJ_ROOT/include"
# AC_CHECK_HEADERS([projects.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],[" -L$PROJ_ROOT/lib -lproj"])
# AC_SUBST([PROJ_INCLUDE],[" -I$PROJ_ROOT/include"])],
# [AC_MSG_ERROR([$PROJ_ROOT is not a directory! PROJ suppressed])])])],
# [AC_MSG_CHECKING([for the PROJ library])
# AC_MSG_RESULT([suppressed])])
# ----------------------------------------------------------------------
# At the moment, there are two possible CDI bindings
# (default for CDO) linking directly to CDI's object files in ./libcdi/src
......
......@@ -198,8 +198,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PROJ_INCLUDE = @PROJ_INCLUDE@
PROJ_LDFLAGS = @PROJ_LDFLAGS@
PYTHON = @PYTHON@
RANLIB = @RANLIB@
RUBY = @RUBY@
......
......@@ -186,8 +186,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PROJ_INCLUDE = @PROJ_INCLUDE@
PROJ_LDFLAGS = @PROJ_LDFLAGS@
PYTHON = @PYTHON@
RANLIB = @RANLIB@
RUBY = @RUBY@
......
......@@ -254,31 +254,31 @@ AC_MSG_RESULT([$enable_ieg])
AC_SUBST([ENABLE_IEG],[$enable_ieg])
# ----------------------------------------------------------------------
# Checks for PROJ.4 library
AC_ARG_WITH([proj],
[AS_HELP_STRING([--with-proj=<directory>],
[Specify location of PROJ library for cartographic projections.])],
[AS_CASE(["$with_proj"],
[no],[AC_MSG_CHECKING([for proj library])
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([projects.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"])
AC_SUBST([PROJ_INCLUDE],[""])],
[*],[PROJ_ROOT=$with_proj
AS_IF([test -d "$PROJ_ROOT"],
[LDFLAGS="$LDFLAGS -L$PROJ_ROOT/lib"
CPPFLAGS="$CPPFLAGS -I$PROJ_ROOT/include"
AC_CHECK_HEADERS([projects.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],[" -L$PROJ_ROOT/lib -lproj"])
AC_SUBST([PROJ_INCLUDE],[" -I$PROJ_ROOT/include"])],
[AC_MSG_ERROR([$PROJ_ROOT is not a directory! PROJ suppressed])])])],
[AC_MSG_CHECKING([for the PROJ library])
AC_MSG_RESULT([suppressed])])
# AC_ARG_WITH([proj],
# [AS_HELP_STRING([--with-proj=<directory>],
# [Specify location of PROJ library for cartographic projections.])],
# [AS_CASE(["$with_proj"],
# [no],[AC_MSG_CHECKING([for proj library])
# AC_MSG_RESULT([suppressed])],
# [yes],[AC_CHECK_HEADERS([projects.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"])
# AC_SUBST([PROJ_INCLUDE],[""])],
# [*],[PROJ_ROOT=$with_proj
# AS_IF([test -d "$PROJ_ROOT"],
# [LDFLAGS="$LDFLAGS -L$PROJ_ROOT/lib"
# CPPFLAGS="$CPPFLAGS -I$PROJ_ROOT/include"
# AC_CHECK_HEADERS([projects.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],[" -L$PROJ_ROOT/lib -lproj"])
# AC_SUBST([PROJ_INCLUDE],[" -I$PROJ_ROOT/include"])],
# [AC_MSG_ERROR([$PROJ_ROOT is not a directory! PROJ suppressed])])])],
# [AC_MSG_CHECKING([for the PROJ library])
# AC_MSG_RESULT([suppressed])])
# ----------------------------------------------------------------------
# At the moment, there are two possible CDI bindings
# (default for CDO) linking directly to CDI's object files in ./libcdi/src
......
......@@ -192,8 +192,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PROJ_INCLUDE = @PROJ_INCLUDE@
PROJ_LDFLAGS = @PROJ_LDFLAGS@
PYTHON = @PYTHON@
RANLIB = @RANLIB@
RUBY = @RUBY@
......
......@@ -54,9 +54,6 @@
/* Define to 1 for NETCDF support */
#undef HAVE_LIBNETCDF
/* Define to 1 for PROJ support */
#undef HAVE_LIBPROJ
/* Define to 1 if you have the `pthread' library (-lpthread). */
#undef HAVE_LIBPTHREAD
......@@ -84,9 +81,6 @@
/* 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 <pthread.h> header file. */
#undef HAVE_PTHREAD_H
......
......@@ -155,8 +155,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PROJ_INCLUDE = @PROJ_INCLUDE@
PROJ_LDFLAGS = @PROJ_LDFLAGS@
PYTHON = @PYTHON@
RANLIB = @RANLIB@
RUBY = @RUBY@
......
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