diff options
31 files changed, 2 insertions, 1633 deletions
diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 4f78ff32..00000000 --- a/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -SUBDIRS = include src man data cmake -DIST_SUBDIRS = include src man data cmake test - -EXTRA_DIST = CMakeLists.txt CITATION README.md - -dist_doc_DATA = COPYING NEWS AUTHORS - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = proj.pc - -AUTOMAKE_OPTIONS = dist-zip -ACLOCAL_AMFLAGS = -I m4 - -check-local: - cd test; $(MAKE) check - -all-local: README - -README: README.md - fgrep -v "[![" $< > $@ - -clean-local: - $(RM) README diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index e76f3bd9..00000000 --- a/autogen.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# -# Autotools boostrapping script -# -giveup() -{ - echo - echo " Something went wrong, giving up!" - echo - exit 1 -} - -OSTYPE=`uname -s` - -for libtoolize in glibtoolize libtoolize; do - LIBTOOLIZE=`which $libtoolize 2>/dev/null` - if test "$LIBTOOLIZE"; then - break; - fi -done - -#AMFLAGS="--add-missing --copy --force-missing" -AMFLAGS="--add-missing --copy" -if test "$OSTYPE" = "IRIX" -o "$OSTYPE" = "IRIX64"; then - AMFLAGS=$AMFLAGS" --include-deps"; -fi - -echo "Running aclocal" -aclocal -I ./m4 || giveup -echo "Running autoheader" -autoheader || giveup -echo "Running libtoolize" -$LIBTOOLIZE --force --copy || giveup -echo "Running automake" -automake $AMFLAGS # || giveup -echo "Running autoconf" -autoconf || giveup - -echo "======================================" -echo "Now you are ready to run './configure'" -echo "======================================" diff --git a/cmake/Makefile.am b/cmake/Makefile.am deleted file mode 100644 index de982198..00000000 --- a/cmake/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -EXTRA_DIST = CMakeLists.txt \ - Ccache.cmake \ - ProjInstallPath.cmake \ - ProjUtilities.cmake \ - proj_config.cmake.in \ - ProjConfig.cmake \ - ProjMac.cmake \ - ProjReadme.cmake \ - ProjTest.cmake \ - ProjVersion.cmake \ - policies.cmake \ - proj_config.cmake.in \ - project-config-version.cmake.in \ - project-config.cmake.in \ - FindSqlite3.cmake - diff --git a/configure.ac b/configure.ac deleted file mode 100644 index f303cd77..00000000 --- a/configure.ac +++ /dev/null @@ -1,398 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.59) -AC_INIT([PROJ], [8.2.0], - [https://github.com/OSGeo/PROJ/issues], proj, [https://proj.org]) -AC_CONFIG_MACRO_DIR([m4]) -AC_LANG(C) - -AC_CONFIG_AUX_DIR([.]) -AM_INIT_AUTOMAKE([subdir-objects]) -AM_CONFIG_HEADER(src/proj_config.h) - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_CC_C99 -AC_PROG_CXX -AX_CXX_COMPILE_STDCXX_11([noext],[mandatory]) -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET -AM_PROG_LIBTOOL - -PKG_PROG_PKG_CONFIG - -dnl Enable as much warnings as possible -AX_CFLAGS_WARN_ALL(C_WFLAGS) -AX_CXXFLAGS_WARN_ALL(CXX_WFLAGS) - -dnl For ICC: it needs -we10006 instead of -Werror to turn unknown options to errors -dnl Some gcc/clang versions might succeed on this test, so also include -Werror in ERROR_ON_UNKNOWN_OPTIONS -AX_CHECK_COMPILE_FLAG([-Werror -we10006],[ERROR_ON_UNKNOWN_OPTIONS="-Werror -we10006"],[ERROR_ON_UNKNOWN_OPTIONS="-Werror"]) - -dnl A few ICC warnings to turn off -dnl warning #188: enumerated type mixed with another type (needed on libcsf) -dnl warning #1684: conversion from pointer to same-sized integral type (potential portability problem) (needed on frmts/mrf) -dnl warning #2259: non-pointer conversion from "size_t={unsigned long}" to "int" may lose significant bits -dnl warning #2304: non-explicit constructor with single argument may cause implicit type conversion -dnl warning #3280: declaration hides member -dnl remark #11074: Inlining inhibited by limit max-size -dnl remark #11076: To get full report use -qopt-report=4 -qopt-report-phase ipo -AX_CHECK_COMPILE_FLAG([-diag-disable 188,1684,2259,2304,3280,11074,11076],[C_WFLAGS="$C_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076" CXX_WFLAGS="$CXX_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -AX_CHECK_COMPILE_FLAG([-Wextra],[C_WFLAGS="$C_WFLAGS -Wextra" CXX_WFLAGS="$CXX_WFLAGS -Wextra"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Winit-self],[C_WFLAGS="$C_WFLAGS -Winit-self" CXX_WFLAGS="$CXX_WFLAGS -Winit-self"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Wunused-parameter], [C_WFLAGS="$C_WFLAGS -Wunused-parameter" CXX_WFLAGS="$CXX_WFLAGS -Wunused-parameter" NO_UNUSED_PARAMETER_FLAG="-Wno-unused-parameter"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Wmissing-prototypes], [C_WFLAGS="$C_WFLAGS -Wmissing-prototypes"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Wmissing-declarations], [C_WFLAGS="$C_WFLAGS -Wmissing-declarations"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Wformat], [C_WFLAGS="$C_WFLAGS -Wformat" CXX_WFLAGS="$CXX_WFLAGS -Wformat"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Wformat -Werror=format-security -Wno-format-nonliteral], [C_WFLAGS="$C_WFLAGS -Werror=format-security -Wno-format-nonliteral" CXX_WFLAGS="$CXX_WFLAGS -Werror=format-security -Wno-format-nonliteral"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Wshorten-64-to-32], [C_WFLAGS="$C_WFLAGS -Wshorten-64-to-32" CXX_WFLAGS="$CXX_WFLAGS -Wshorten-64-to-32"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Wlogical-op], [C_WFLAGS="$C_WFLAGS -Wlogical-op" CXX_WFLAGS="$CXX_WFLAGS -Wlogical-op" NO_LOGICAL_OP_FLAG="-Wno-logical-op"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Wshadow], [C_WFLAGS="$C_WFLAGS -Wshadow" CXX_WFLAGS="$CXX_WFLAGS -Wshadow"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -dnl Error out on things that will fail with MSVC -AX_CHECK_COMPILE_FLAG([-Werror=vla], [C_WFLAGS="$C_WFLAGS -Werror=vla" CXX_WFLAGS="$CXX_WFLAGS -Werror=vla"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Werror=declaration-after-statement], [C_WFLAGS="$C_WFLAGS -Wdeclaration-after-statement"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -dnl -Wclobbered is not reliable on most gcc versions -dnl AX_CHECK_COMPILE_FLAG([-Wno-clobbered], [C_WFLAGS="$C_WFLAGS -Wno-clobbered" CXX_WFLAGS="$CXX_WFLAGS -Wno-clobbered"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -dnl Warn when macros __TIME__, __DATE__ or __TIMESTAMP__ are encountered as they might prevent bit-wise-identical reproducible compilations. -AX_CHECK_COMPILE_FLAG([-Wdate-time], [C_WFLAGS="$C_WFLAGS -Wdate-time" CXX_WFLAGS="$CXX_WFLAGS -Wdate-time"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -dnl GCC 6 warnings -AX_CHECK_COMPILE_FLAG([-Wnull-dereference], [C_WFLAGS="$C_WFLAGS -Wnull-dereference" CXX_WFLAGS="$CXX_WFLAGS -Wnull-dereference"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Wduplicated-cond], [C_WFLAGS="$C_WFLAGS -Wduplicated-cond" CXX_WFLAGS="$CXX_WFLAGS -Wduplicated-cond"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -dnl GCC 7 warnings -dnl Do not enable yet. Causes warning in alg/gdalthinplate.cpp due to armadillo templates -dnl AX_CHECK_COMPILE_FLAG([-Wduplicated-branches], [C_WFLAGS="$C_WFLAGS -Wduplicated-branches" CXX_WFLAGS="$CXX_WFLAGS -Wduplicated-branches"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -dnl GCC 8 warnings -AC_LANG_PUSH([C++]) -AX_CHECK_COMPILE_FLAG([-Wextra-semi], [CXX_WFLAGS="$CXX_WFLAGS -Wextra-semi"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AC_LANG_POP([C++]) - -AX_CHECK_COMPILE_FLAG([-Wno-sign-compare], [NO_SIGN_COMPARE="-Wno-sign-compare"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -dnl clang >= 3.9 -AX_CHECK_COMPILE_FLAG([-Wcomma], [C_WFLAGS="$C_WFLAGS -Wcomma" CXX_WFLAGS="$CXX_WFLAGS -Wcomma"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -dnl clang and gcc 5 -AX_CHECK_COMPILE_FLAG([-Wfloat-conversion], [C_WFLAGS="$C_WFLAGS -Wfloat-conversion" CXX_WFLAGS="$CXX_WFLAGS -Wfloat-conversion"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -dnl clang >= 3.2 -AX_CHECK_COMPILE_FLAG([-Wdocumentation -Wno-documentation-deprecated-sync], [C_WFLAGS="$C_WFLAGS -Wdocumentation -Wno-documentation-deprecated-sync" CXX_WFLAGS="$CXX_WFLAGS -Wdocumentation -Wno-documentation-deprecated-sync"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -dnl C++ specific stuff - -AC_LANG_PUSH([C++]) -AX_CHECK_COMPILE_FLAG([-Wunused-private-field], [CXX_WFLAGS="$CXX_WFLAGS -Wunused-private-field"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Wmissing-declarations], [CXX_WFLAGS="$CXX_WFLAGS -Wmissing-declarations"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Wnon-virtual-dtor], [CXX_WFLAGS="$CXX_WFLAGS -Wnon-virtual-dtor" NO_NON_VIRTUAL_DTOR_FLAG="-Wno-non-virtual-dtor"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Wold-style-cast], [WARN_OLD_STYLE_CAST="-Wold-style-cast"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Weffc++], [WARN_EFFCPLUSPLUS="-Weffc++"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -dnl g++-4.8 complain a bit too much with -Weffc++ -if test "$WARN_EFFCPLUSPLUS" != ""; then - SAVED_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $WARN_EFFCPLUSPLUS -Werror" - AC_MSG_CHECKING([if -Weffc++ should be enabled]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[ - class Base {}; - class A: public Base {}; - ]])], - [AC_MSG_RESULT([yes])], - [WARN_EFFCPLUSPLUS=""] - [AC_MSG_RESULT([no])]) - CXXFLAGS="$SAVED_CXXFLAGS" - CXX_WFLAGS="$CXX_WFLAGS $WARN_EFFCPLUSPLUS" -fi - -dnl Clang enables -Woverloaded-virtual if -Wall is defined, but not GCC -AX_CHECK_COMPILE_FLAG([-Woverloaded-virtual], [CXX_WFLAGS="$CXX_WFLAGS -Woverloaded-virtual"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -AX_CHECK_COMPILE_FLAG([-Wweak-vtables], [CXX_WFLAGS="$CXX_WFLAGS -Wweak-vtables"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Wdeprecated], [CXX_WFLAGS="$CXX_WFLAGS -Wdeprecated"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Wabstract-vbase-init], [CXX_WFLAGS="$CXX_WFLAGS -Wabstract-vbase-init"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -AX_CHECK_COMPILE_FLAG([-Winconsistent-missing-destructor-override], [CXX_WFLAGS="$CXX_WFLAGS -Winconsistent-missing-destructor-override"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT=no -AX_CHECK_COMPILE_FLAG([-Wzero-as-null-pointer-constant], [CXX_WFLAGS="$CXX_WFLAGS -Wzero-as-null-pointer-constant" HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT=yes NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG="-Wno-zero-as-null-pointer-constant"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -if test "$HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT" = "yes"; then -AC_DEFINE_UNQUOTED(HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT, 1, - [Define to 1 if the compiler supports -Wzero-as-null-pointer-constant]) -fi -AC_LANG_POP([C++]) - -dnl --------------------------------------------------------------------------- -dnl Check for --enable-lto -dnl --------------------------------------------------------------------------- - -AC_MSG_CHECKING([to enable LTO (link time optimization) build]) - -AC_ARG_ENABLE(lto, - AS_HELP_STRING([--enable-lto], - [enable LTO(link time optimization) (disabled by default)])) - -FLTO_FLAG="" -if test "x$enable_lto" = "xyes"; then - AC_LANG_PUSH([C++]) - AX_CHECK_COMPILE_FLAG([-flto], [FLTO_FLAG="-flto"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - if test "$FLTO_FLAG" != ""; then - SAVED_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $FLTO_FLAG -Werror" - AC_MSG_CHECKING([if -flto is available at link time]) - AC_LINK_IFELSE([AC_LANG_PROGRAM( - [[]])], - [AC_MSG_RESULT([yes])], - [FLTO_FLAG=""] - [AC_MSG_RESULT([no])]) - CXXFLAGS="$SAVED_CXXFLAGS" - fi - AC_LANG_POP([C++]) - AX_CHECK_COMPILE_FLAG([-Wodr], [CXX_WFLAGS="$CXX_WFLAGS -Wodr"],,[$ERROR_ON_UNKNOWN_OPTIONS]) -else - AC_MSG_RESULT([no]) -fi -AC_SUBST(FLTO_FLAG,$FLTO_FLAG) - -dnl Result in better inlining, but larger file -dnl AX_CHECK_COMPILE_FLAG([-fno-semantic-interposition], [CFLAGS="$CFLAGS -fno-semantic-interposition" CXXFLAGS="$CXXFLAGS -fno-semantic-interposition"],,[$ERROR_ON_UNKNOWN_OPTIONS]) - -AC_SUBST(C_WFLAGS,$C_WFLAGS) -AC_SUBST(CXX_WFLAGS,$CXX_WFLAGS) -AC_SUBST(NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG,$NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG) - -CFLAGS="${CFLAGS} -fvisibility=hidden" -CXXFLAGS="${CXXFLAGS} -fvisibility=hidden" - -case "${host_os}" in - cygwin* | mingw32* | pw32* | beos* | darwin*) - CFLAGS="${CFLAGS} -DNOMINMAX" - CXXFLAGS="${CXXFLAGS} -DNOMINMAX" - ;; - *) - ;; -esac - -dnl Checks for libraries. -save_CFLAGS="$CFLAGS" -CFLAGS=`echo "$CFLAGS" | sed "s/-Werror/ /"` -AC_CHECK_LIB(m,exp,,HAVE_LIBM=no,) -CFLAGS="$save_CFLAGS" - -dnl We check for headers -AC_HEADER_STDC - -dnl Check flag for accurate arithmetic with Intel compiler. This is -dnl needed to stop the compiler from ignoring parentheses in expressions -dnl like (a + b) + c and from simplifying 0.0 + x to x (which is wrong if -dnl x = -0.0). -AX_CHECK_COMPILE_FLAG([-fp-model precise], - [CFLAGS="$CFLAGS -fp-model precise"],,[-Werror]) - -AC_SEARCH_LIBS([sqrt], [m]) - -AC_CHECK_FUNC(localeconv, [AC_DEFINE(HAVE_LOCALECONV,1,[Define to 1 if you have localeconv])]) -AC_CHECK_FUNCS([strerror]) -AC_CHECK_LIB(dl,dladdr,,HAVE_LIBDL=no,) - -dnl --------------------------------------------------------------------------- -dnl Provide a mechanism to disable real mutex support (if lacking win32 or -dnl posix mutexes for instance). -dnl --------------------------------------------------------------------------- - -AC_ARG_WITH([mutex], - AS_HELP_STRING([--without-mutex], - [Disable real mutex locks (lacking pthreads)]),,) - -AC_MSG_CHECKING([for mutexes]) -THREAD_LIB="" -if test "$with_mutex" = yes -o x"$with_mutex" = x ; then - MUTEX_SETTING=pthread - AC_CHECK_LIB(pthread,pthread_create,PTHREAD_EXISTS=YES,,,) - if test -n "$PTHREAD_EXISTS" ; then - THREAD_LIB="-lpthread" - fi - AC_CHECK_LIB(pthread,pthread_mutexattr_settype,,,) - AC_CHECK_DECL(PTHREAD_MUTEX_RECURSIVE, - AC_DEFINE(HAVE_PTHREAD_MUTEX_RECURSIVE, [], [Define if your pthreads implementation have PTHREAD_MUTEX_RECURSIVE]), - , - [#include <pthread.h>]) - AC_MSG_RESULT([enabled, pthread]) -else - MUTEX_SETTING=stub - AC_MSG_RESULT([disabled by user]) -fi - -AC_SUBST(MUTEX_SETTING,$MUTEX_SETTING) -AC_SUBST(THREAD_LIB,$THREAD_LIB) - -dnl --------------------------------------------------------------------------- -dnl Check for sqlite3 library and binary -dnl --------------------------------------------------------------------------- - -if test "x$SQLITE3_CFLAGS$SQLITE3_LIBS" = "x" ; then - - dnl Would build and run with older versions, but with horrible performance - dnl See https://github.com/OSGeo/PROJ/issues/1718 - - PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.11]) -fi -AC_SUBST(SQLITE3_CFLAGS,$SQLITE3_CFLAGS) -AC_SUBST(SQLITE3_LIBS,$SQLITE3_LIBS) - -AC_CHECK_PROG(SQLITE3_CHECK,sqlite3,yes) -if test x"$SQLITE3_CHECK" != x"yes" ; then - AC_MSG_ERROR([Please install sqlite3 binary.]) -fi - -dnl --------------------------------------------------------------------------- -dnl Check for libtiff -dnl --------------------------------------------------------------------------- - -AC_ARG_ENABLE([tiff], - AS_HELP_STRING([--enable-tiff], - [Enable TIFF support; strongly encouraged to read some grids [default=yes]])) - -if test "x$enable_tiff" != "xno" -o "x$enable_tiff" = ""; then - if test "x$TIFF_CFLAGS$TIFF_LIBS" = "x" ; then - if $PKG_CONFIG libtiff; then - PKG_CHECK_MODULES([TIFF], [libtiff]) - else - PKG_CHECK_MODULES([TIFF], [libtiff-4]) - fi - fi - TIFF_ENABLED_FLAGS=-DTIFF_ENABLED -fi -AC_SUBST(TIFF_CFLAGS,$TIFF_CFLAGS) -AC_SUBST(TIFF_LIBS,$TIFF_LIBS) -AC_SUBST(TIFF_ENABLED_FLAGS,$TIFF_ENABLED_FLAGS) - -dnl --------------------------------------------------------------------------- -dnl Check for curl -dnl --------------------------------------------------------------------------- - -FOUND_CURL=no -CURL_CFLAGS= -CURL_LIB= - -AC_ARG_WITH(curl, - [ --with-curl[=ARG] Enable curl support (ARG=path to curl-config.)],,,) - -dnl Clear some cache variables -unset ac_cv_path_LIBCURL - -if test "`basename xx/$with_curl`" = "curl-config" ; then - LIBCURL_CONFIG="$with_curl" -elif test "$with_curl" = "no" ; then - LIBCURL_CONFIG=no -else - AC_PATH_PROG(LIBCURL_CONFIG, curl-config, not-found) -fi - -if test "$LIBCURL_CONFIG" = "not-found" ; then - AC_MSG_ERROR([curl not found. If wanting to do a build without curl support (and thus without built-in networking capability), explictly disable it with --without-curl]) -elif test "$LIBCURL_CONFIG" != "no" ; then - - CURL_VERNUM=`$LIBCURL_CONFIG --vernum` - CURL_VER=`$LIBCURL_CONFIG --version | awk '{print $2}'` - - AC_MSG_RESULT([ found libcurl version $CURL_VER]) - - AC_CHECK_LIB(curl,curl_global_init,FOUND_CURL=yes,FOUND_CURL=no,`$LIBCURL_CONFIG --libs`) - - if test "$FOUND_CURL" = "no" ; then - AC_MSG_ERROR([curl not found. If wanting to do a build without curl support (and thus without built-in networking capability), explictly disable it with --without-curl]) - fi - CURL_ENABLED_FLAGS=-DCURL_ENABLED -fi - -if test "$FOUND_CURL" = "yes" ; then - CURL_CFLAGS=`$LIBCURL_CONFIG --cflags` - CURL_LIBS=`$LIBCURL_CONFIG --libs` -fi - -AC_SUBST(CURL_CFLAGS,$CURL_CFLAGS) -AC_SUBST(CURL_LIBS,$CURL_LIBS) -AC_SUBST(CURL_ENABLED_FLAGS,$CURL_ENABLED_FLAGS) -AM_CONDITIONAL(HAVE_CURL, [test "x$FOUND_CURL" = "xyes"]) - -dnl --------------------------------------------------------------------------- -dnl Check for extra libraries, required for static linking with pkg-config -dnl --------------------------------------------------------------------------- - -EXTRA_LIBS="-lstdc++ -lsqlite3" -if test "no$THREAD_LIB" != "no"; then - EXTRA_LIBS="$EXTRA_LIBS $THREAD_LIB" -fi -if test "x$enable_tiff" != "xno" -o "x$enable_tiff" = ""; then - EXTRA_LIBS="$EXTRA_LIBS -ltiff" -fi -if test "$FOUND_CURL" = "yes" ; then - EXTRA_LIBS="$EXTRA_LIBS -lcurl" -fi -if test "$HAVE_LIBM" != "no" ; then - EXTRA_LIBS="$EXTRA_LIBS -lm" -fi -if test "$HAVE_LIBDL" != "no" ; then - EXTRA_LIBS="$EXTRA_LIBS -ldl" -fi -AC_SUBST(EXTRA_LIBS,$EXTRA_LIBS) - -dnl --------------------------------------------------------------------------- -dnl proj-lib-env-var-tried-last -dnl --------------------------------------------------------------------------- - -AC_ARG_ENABLE(proj-lib-env-var-tried-last, - AS_HELP_STRING([--enable-proj-lib-env-var-tried-last], - [Whether the PROJ_LIB environment variable should be tried after the hardcoded location [default=no]])) - -if test "x$enable_proj_lib_env_var_tried_last" = "xyes"; then - AC_SUBST(PROJ_LIB_ENV_VAR_TRIED_LAST_FLAGS,-DPROJ_LIB_ENV_VAR_TRIED_LAST) -fi - -dnl --------------------------------------------------------------------------- -dnl Check for external Google Test -dnl --------------------------------------------------------------------------- - -AC_ARG_WITH(external-gtest, - AS_HELP_STRING([--with-external-gtest], - [Whether to use external Google Test]),,) - -if test "x$with_external_gtest" = "xyes" ; then - AC_MSG_RESULT([using external GTest.]) - PKG_CHECK_MODULES([GTEST], [gtest >= 1.8.0]) -else - AC_MSG_RESULT([using internal GTest.]) - GTEST_CFLAGS="-I\$(top_srcdir)/test/googletest/include" - GTEST_LIBS="\$(top_builddir)/test/googletest/libgtest.la" -fi -AM_CONDITIONAL(USE_EXTERNAL_GTEST, [test "x$with_external_gtest" = "xyes"]) -AC_SUBST(GTEST_CFLAGS,$GTEST_CFLAGS) -AC_SUBST(GTEST_LIBS,$GTEST_LIBS) - -dnl --------------------------------------------------------------------------- -dnl Generate files -dnl --------------------------------------------------------------------------- - -AC_CONFIG_FILES([Makefile cmake/Makefile src/Makefile include/Makefile include/proj/Makefile - include/proj/internal/Makefile - include/proj/internal/vendor/Makefile - include/proj/internal/vendor/nlohmann/Makefile - test/Makefile test/cli/Makefile test/gie/Makefile test/gigs/Makefile test/unit/Makefile - man/Makefile man/man1/Makefile data/Makefile]) -if ! test "x$with_external_gtest" = "xyes" ; then - AC_CONFIG_FILES([test/googletest/Makefile test/googletest/include/Makefile - test/googletest/include/gtest/Makefile - test/googletest/include/gtest/internal/Makefile - test/googletest/include/gtest/internal/custom/Makefile - test/googletest/src/Makefile]) -fi - -AC_CONFIG_FILES([proj.pc]) - -AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 2e6f7ae0..00000000 --- a/data/Makefile.am +++ /dev/null @@ -1,226 +0,0 @@ -DATAPATH = $(top_srcdir)/data - -pkgdata_DATA = proj.ini GL27 nad.lst nad27 nad83 world other.extra \ - CH \ - ITRF2000 ITRF2008 ITRF2014 proj.db \ - projjson.schema.json \ - deformation_model.schema.json \ - triangulation.schema.json - -SQL_ORDERED_LIST = sql/begin.sql \ - sql/proj_db_table_defs.sql \ - sql/conversion_triggers.sql \ - sql/customizations_early.sql \ - sql/metadata.sql \ - sql/unit_of_measure.sql \ - sql/extent.sql \ - sql/scope.sql \ - sql/coordinate_system.sql \ - sql/axis.sql \ - sql/ellipsoid.sql \ - sql/prime_meridian.sql \ - sql/geodetic_datum.sql \ - sql/geodetic_datum_ensemble_member.sql \ - sql/vertical_datum.sql \ - sql/vertical_datum_ensemble_member.sql \ - sql/conversion.sql \ - sql/geodetic_crs.sql \ - sql/projected_crs.sql \ - sql/vertical_crs.sql \ - sql/compound_crs.sql \ - sql/helmert_transformation.sql \ - sql/grid_transformation.sql \ - sql/grid_transformation_custom.sql \ - sql/other_transformation.sql \ - sql/other_transformation_custom.sql \ - sql/concatenated_operation.sql \ - sql/concatenated_operation_step.sql \ - sql/alias_name.sql \ - sql/supersession.sql \ - sql/deprecation.sql \ - sql/esri.sql \ - sql/ignf.sql \ - sql/nkg.sql \ - sql/iau.sql \ - sql/grid_alternatives.sql \ - sql/grid_alternatives_generated_noaa.sql \ - sql/customizations.sql \ - sql/nkg_post_customizations.sql \ - sql/commit.sql - -EXTRA_DIST = proj.ini GL27 nad.lst nad27 nad83 \ - world other.extra \ - CH \ - ITRF2000 ITRF2008 ITRF2014 \ - projjson.schema.json \ - deformation_model.schema.json \ - triangulation.schema.json \ - CMakeLists.txt \ - tests/test_nodata.gtx \ - tests/test_vgrid_bigendian_bigtiff.tif \ - tests/test_vgrid_bigendian.tif \ - tests/test_vgrid_bigtiff.tif \ - tests/test_vgrid_bottomup_with_matrix.tif \ - tests/test_vgrid_bottomup_with_scale.tif \ - tests/test_vgrid_deflate_floatingpointpredictor.tif \ - tests/test_vgrid_deflate.tif \ - tests/test_vgrid_float64.tif \ - tests/test_vgrid_in_second_channel.tif \ - tests/test_vgrid_int16.tif \ - tests/test_vgrid_int32.tif \ - tests/test_vgrid_uint32.tif \ - tests/test_vgrid_invalid_channel_type.tif \ - tests/test_vgrid_nodata.tif \ - tests/test_vgrid_pixelisarea.tif \ - tests/test_vgrid_pixelispoint.tif \ - tests/test_vgrid_uint16.tif \ - tests/test_vgrid_uint16_with_scale_offset.tif \ - tests/test_vgrid_unsupported_byte.tif \ - tests/test_vgrid_with_overview.tif \ - tests/test_vgrid_with_subgrid.tif \ - tests/test_hgrid.tif \ - tests/test_hgrid_separate.tif \ - tests/test_hgrid_tiled.tif \ - tests/test_hgrid_tiled_separate.tif \ - tests/test_hgrid_strip.tif \ - tests/test_hgrid_positive_west.tif \ - tests/test_hgrid_lon_shift_first.tif \ - tests/test_hgrid_radian.tif \ - tests/test_hgrid_degree.tif \ - tests/test_hgrid_with_overview.tif \ - tests/test_hgrid_extra_ifd_with_other_info.tif \ - tests/test_hgrid_with_subgrid.tif \ - tests/test_hgrid_with_subgrid_no_grid_name.tif \ - tests/subset_of_gr3df97a.tif \ - tests/egm96_15_uncompressed_truncated.tif \ - tests/test_vgrid_single_strip_truncated.tif \ - tests/nkgrf03vel_realigned_extract.tif \ - tests/nkgrf03vel_realigned_xy_extract.ct2 \ - tests/nkgrf03vel_realigned_z_extract.gtx \ - tests/test_hgrid_with_two_level_of_subgrids_no_grid_name.tif \ - tests/us_noaa_geoid06_ak_subset_at_antimeridian.tif \ - tests/test_hgrid_little_endian.gsb \ - tests/test_hgrid_big_endian.gsb \ - tests/test_3d_grid_projected.tif \ - tests/BETA2007.gsb \ - tests/MD \ - tests/alaska \ - tests/conus \ - tests/egm96_15_downsampled.gtx \ - tests/ntv1_can.dat \ - tests/ntv2_0_downsampled.gsb \ - tests/ntf_r93.gsb \ - tests/simple_model_degree_3d_grid.tif \ - tests/simple_model_degree_horizontal.json \ - tests/simple_model_degree_3d.json \ - tests/simple_model_metre_3d_grid.tif \ - tests/simple_model_metre_horizontal.json \ - tests/simple_model_metre_3d.json \ - tests/simple_model_metre_3d_geocentric.json \ - tests/simple_model_metre_vertical_grid.tif \ - tests/simple_model_metre_vertical.json \ - tests/simple_model_polar.json \ - tests/simple_model_polar.tif \ - tests/simple_model_wrap_east.json \ - tests/simple_model_wrap_east.tif \ - tests/simple_model_wrap_west.json \ - tests/simple_model_wrap_west.tif \ - tests/simple_model_projected.json \ - tests/tinshift_crs_implicit.json \ - tests/tinshift_simplified_kkj_etrs.json \ - tests/tinshift_simplified_n60_n2000.json \ - tests/tinshift_fallback_nearest_side.json \ - tests/tinshift_fallback_nearest_centroid.json \ - generate_proj_db.cmake sql_filelist.cmake \ - $(SQL_ORDERED_LIST) - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - @for gridfile in $(DATAPATH)/*.gsb $(DATAPATH)/*.gtx $(DATAPATH)/ntv1_can.dat dummy \ - $(DATAPATH)/alaska $(DATAPATH)/conus $(DATAPATH)/hawaii \ - $(DATAPATH)/prvi $(DATAPATH)/stgeorge $(DATAPATH)/stlrnc $(DATAPATH)/stpaul \ - $(DATAPATH)/FL $(DATAPATH)/MD $(DATAPATH)/TN $(DATAPATH)/WI $(DATAPATH)/WO; do \ - if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \ - echo $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/`basename $$gridfile`; \ - $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/`basename $$gridfile`; \ - fi; \ - done - -proj.db: $(DATAPATH)/sql/*.sql - @echo "Make proj.db" - $(RM) proj.db - @export SQL_EXPANDED_LIST=""; \ - for x in $(SQL_ORDERED_LIST); do \ - export SQL_EXPANDED_LIST="$${SQL_EXPANDED_LIST} $(DATAPATH)/$$x"; \ - done; \ - cat $${SQL_EXPANDED_LIST} | sed 's/$${PROJ_VERSION}/${PACKAGE_VERSION}/' > all.sql.in; \ - if test "x$(PROJ_DB_CACHE_DIR)" != "x" -a -x "$$(command -v md5sum)" -a -f "$(PROJ_DB_CACHE_DIR)/proj.db" -a -f "$(PROJ_DB_CACHE_DIR)/proj.db.sql.md5" ; then \ - cat all.sql.in | md5sum | diff - "$(PROJ_DB_CACHE_DIR)/proj.db.sql.md5" > /dev/null \ - && (echo "Reusing cached proj.db"; cp "$(PROJ_DB_CACHE_DIR)/proj.db" proj.db); \ - fi; \ - if test ! -f proj.db ; then \ - cat all.sql.in | sqlite3 proj.db; \ - fi; \ - if [ $$? -ne 0 ] ; then \ - echo "Build of proj.db failed"; \ - $(RM) proj.db; \ - exit 1; \ - fi; \ - if test "x$(PROJ_DB_CACHE_DIR)" != "x" -a -x "$$(command -v md5sum)" ; then \ - mkdir -p "$(PROJ_DB_CACHE_DIR)"; \ - cat all.sql.in | md5sum > "$(PROJ_DB_CACHE_DIR)/proj.db.sql.md5"; \ - cp proj.db "$(PROJ_DB_CACHE_DIR)"; \ - fi; \ - $(RM) all.sql.in - -# For out-of-tree builds, link all file of the source data dir to the generated data -# Also link select resource files in a for_tests subdirectory so that we are not -# influenced by the presence of other grids - -# egm96_15_downsampled.gtx created with -# gdal_translate proj-datumgrid/egm96_15.gtx egm96_15_downsampled.gtx -of GTX -outsize 25% 25% -r average - -# ntv2_0_downsampled.gsb created with: -# gdal_translate NTv2:0:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb /tmp/ntv2_0_downsampled.gsb -of NTv2 -outsize 10% 10% -# gdal_translate NTv2:1:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb /tmp/ntv2_0_downsampled.gsb -of NTv2 -outsize 10% 10% -co append_subdataset=yes -# gdal_translate NTv2:2:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb /tmp/ntv2_0_downsampled.gsb -of NTv2 -outsize 10% 10% -co append_subdataset=yes -# gdal_translate NTv2:3:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb /tmp/ntv2_0_downsampled.gsb -of NTv2 -outsize 10% 10% -co append_subdataset=yes -# gdal_translate NTv2:99:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb /tmp/ntv2_0_downsampled.gsb -of NTv2 -co append_subdataset=yes -# gdal_translate NTv2:44:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb /tmp/ntv2_0_downsampled.gsb -of NTv2 -co append_subdataset=yes -# gdal_translate NTv2:4:/home/even/proj/proj-datumgrid/north-america/ntv2_0.gsb /tmp/ntv2_0_downsampled.gsb -of NTv2 -co append_subdataset=yes - -check-local: - @if [ ! -f GL27 ]; then \ - for x in $(DATAPATH)/*; do \ - ln -sf $$x .; \ - done \ - fi; \ - rm -rf for_tests; \ - mkdir for_tests; \ - for x in $(DATAPATH)/GL27 \ - $(DATAPATH)/nad27 \ - $(DATAPATH)/nad83 \ - $(DATAPATH)/tests/ntv1_can.dat \ - $(DATAPATH)/tests/MD \ - $(DATAPATH)/tests/ntf_r93.gsb \ - $(DATAPATH)/tests/conus \ - $(DATAPATH)/tests/alaska \ - $(DATAPATH)/ITRF2000 \ - $(DATAPATH)/tests/BETA2007.gsb; \ - do \ - if test -f "$$x" ; then \ - ln -sf "../$$x" for_tests; \ - else \ - echo "ERROR: grid $$x missing: some tests will be skipped"; \ - exit 1; \ - fi \ - done; \ - ln -sf ../$(DATAPATH)/tests for_tests; \ - ln -sf ../$(DATAPATH)/tests/ntv2_0_downsampled.gsb for_tests/ntv2_0.gsb; \ - ln -sf ../$(DATAPATH)/tests/egm96_15_downsampled.gtx for_tests/egm96_15.gtx; \ - ln -sf ../$(DATAPATH)/proj.ini for_tests; \ - ln -sf ../proj.db for_tests - -clean-local: - $(RM) proj.db - $(RM) -rf for_tests diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index ba96cf80..00000000 --- a/include/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = proj - -EXTRA_DIST = CMakeLists.txt diff --git a/include/proj/Makefile.am b/include/proj/Makefile.am deleted file mode 100644 index e5ae5aed..00000000 --- a/include/proj/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -EXTRA_DIST = CMakeLists.txt - -SUBDIRS = internal - -projdir = $(includedir)/proj - -proj_HEADERS = util.hpp metadata.hpp common.hpp crs.hpp datum.hpp \ - coordinatesystem.hpp coordinateoperation.hpp io.hpp nn.hpp diff --git a/include/proj/internal/Makefile.am b/include/proj/internal/Makefile.am deleted file mode 100644 index 25b71cc5..00000000 --- a/include/proj/internal/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -SUBDIRS = vendor - -noinst_HEADERS = \ - crs_internal.hpp \ - coordinatesystem_internal.hpp \ - internal.hpp \ - io_internal.hpp \ - lru_cache.hpp \ - include_nlohmann_json.hpp \ - tracing.hpp \ - mutex.hpp - diff --git a/include/proj/internal/vendor/Makefile.am b/include/proj/internal/vendor/Makefile.am deleted file mode 100644 index 7d8176b2..00000000 --- a/include/proj/internal/vendor/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = nlohmann diff --git a/include/proj/internal/vendor/nlohmann/Makefile.am b/include/proj/internal/vendor/nlohmann/Makefile.am deleted file mode 100644 index eaf3200e..00000000 --- a/include/proj/internal/vendor/nlohmann/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -noinst_HEADERS = \ - json.hpp diff --git a/m4/ax_cflags_warn_all.m4 b/m4/ax_cflags_warn_all.m4 deleted file mode 100644 index ae0e7ef2..00000000 --- a/m4/ax_cflags_warn_all.m4 +++ /dev/null @@ -1,120 +0,0 @@ -dnl @synopsis AX_CFLAGS_WARN_ALL [(shellvar [,default, [A/NA]])] -dnl -dnl Try to find a compiler option that enables most reasonable -dnl warnings. This macro is directly derived from VL_PROG_CC_WARNINGS -dnl which is split up into two AX_CFLAGS_WARN_ALL and -dnl AX_CFLAGS_WARN_ALL_ANSI -dnl -dnl For the GNU CC compiler it will be -Wall (and -ansi -pedantic) The -dnl result is added to the shellvar being CFLAGS by default. -dnl -dnl Currently this macro knows about GCC, Solaris C compiler, Digital -dnl Unix C compiler, C for AIX Compiler, HP-UX C compiler, IRIX C -dnl compiler, NEC SX-5 (Super-UX 10) C compiler, and Cray J90 (Unicos -dnl 10.0.0.8) C compiler. -dnl -dnl - $1 shell-variable-to-add-to : CFLAGS -dnl - $2 add-value-if-not-found : nothing -dnl - $3 action-if-found : add value to shellvariable -dnl - $4 action-if-not-found : nothing -dnl -dnl @category C -dnl @author Guido Draheim <guidod@gmx.de> -dnl @version 2003-01-06 -dnl @license GPLWithACException - -AC_DEFUN([AX_CFLAGS_WARN_ALL],[dnl -AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl -AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_warn_all])dnl -AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum warnings], -VAR,[VAR="no, unknown" - AC_LANG_SAVE - AC_LANG(C) - ac_save_[]FLAGS="$[]FLAGS" -for ac_arg dnl -in "-pedantic -Wdeclaration-after-statement % dnl - -Wall -Wdeclaration-after-statement" dnl works since GCC version 3 - "-pedantic % -Wall" dnl older GCC - "-xstrconst % -v" dnl Solaris C - "-std1 % -verbose -w0 -warnprotos" dnl Digital Unix - "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX - "-ansi -ansiE % -fullwarn" dnl IRIX - "+ESlit % +w1" dnl HP-UX C - "-Xc % -pvctl[,]fullmsg" dnl NEC SX-5 (Super-UX 10) - "-h conform % -h msglevel 2" dnl Cray C (Unicos) - # -do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) -done - FLAGS="$ac_save_[]FLAGS" - AC_LANG_RESTORE -]) -case ".$VAR" in - .ok|.ok,*) m4_ifvaln($3,$3) ;; - .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[ - AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"]) - m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;; - *) m4_ifvaln($3,$3,[ - if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null - then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR]) - else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"]) - m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR" - fi ]) ;; -esac -AS_VAR_POPDEF([VAR])dnl -AS_VAR_POPDEF([FLAGS])dnl -]) - -dnl the only difference - the LANG selection... and the default FLAGS - -AC_DEFUN([AX_CXXFLAGS_WARN_ALL],[dnl -AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl -AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_warn_all])dnl -AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum warnings], -VAR,[VAR="no, unknown" - AC_LANG_SAVE - AC_LANG(C++) - ac_save_[]FLAGS="$[]FLAGS" -for ac_arg dnl -in "-pedantic % -Wall" dnl GCC - "-xstrconst % -v" dnl Solaris C - "-std1 % -verbose -w0 -warnprotos" dnl Digital Unix - "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX - "-ansi -ansiE % -fullwarn" dnl IRIX - "+ESlit % +w1" dnl HP-UX C - "-Xc % -pvctl[,]fullmsg" dnl NEC SX-5 (Super-UX 10) - "-h conform % -h msglevel 2" dnl Cray C (Unicos) - # -do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - AC_TRY_COMPILE([],[return 0;], - [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) -done - FLAGS="$ac_save_[]FLAGS" - AC_LANG_RESTORE -]) -case ".$VAR" in - .ok|.ok,*) m4_ifvaln($3,$3) ;; - .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[ - AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"]) - m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;; - *) m4_ifvaln($3,$3,[ - if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null - then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR]) - else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"]) - m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR" - fi ]) ;; -esac -AS_VAR_POPDEF([VAR])dnl -AS_VAR_POPDEF([FLAGS])dnl -]) - -dnl implementation tactics: -dnl the for-argument contains a list of options. The first part of -dnl these does only exist to detect the compiler - usually it is -dnl a global option to enable -ansi or -extrawarnings. All other -dnl compilers will fail about it. That was needed since a lot of -dnl compilers will give false positives for some option-syntax -dnl like -Woption or -Xoption as they think of it is a pass-through -dnl to later compile stages or something. The "%" is used as a -dnl delimimiter. A non-option comment can be given after "%%" marks. diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 deleted file mode 100644 index dcabb92a..00000000 --- a/m4/ax_check_compile_flag.m4 +++ /dev/null @@ -1,74 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -# -# DESCRIPTION -# -# Check whether the given FLAG works with the current language's compiler -# or gives an error. (Warnings, however, are ignored) -# -# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -# success/failure. -# -# If EXTRA-FLAGS is defined, it is added to the current language's default -# flags (e.g. CFLAGS) when the check is done. The check is thus made with -# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -# force the compiler to issue an error when a bad flag is given. -# -# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -# -# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -# -# LICENSE -# -# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> -# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com> -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see <https://www.gnu.org/licenses/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 5 - -AC_DEFUN([AX_CHECK_COMPILE_FLAG], -[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF -AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ - ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS - _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" - AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -AS_VAR_IF(CACHEVAR,yes, - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl AX_CHECK_COMPILE_FLAGS diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 0a49a142..00000000 --- a/man/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = man1 - -EXTRA_DIST = CMakeLists.txt diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am deleted file mode 100644 index fc33755f..00000000 --- a/man/man1/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -man_MANS = geod.1 proj.1 cs2cs.1 cct.1 gie.1 projinfo.1 projsync.1 - -EXTRA_DIST = $(man_MANS) - diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 85c22050..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,288 +0,0 @@ -AM_CFLAGS = @C_WFLAGS@ - -EXTRA_PROGRAMS = multistresstest - -TESTS = geodtest -check_PROGRAMS = geodtest - -AM_CPPFLAGS = -DPROJ_LIB=\"$(pkgdatadir)\" \ - -DMUTEX_@MUTEX_SETTING@ -I$(top_srcdir)/include @SQLITE3_CFLAGS@ @TIFF_CFLAGS@ @TIFF_ENABLED_FLAGS@ @CURL_CFLAGS@ @CURL_ENABLED_FLAGS@ @PROJ_LIB_ENV_VAR_TRIED_LAST_FLAGS@ -AM_CXXFLAGS = @CXX_WFLAGS@ @FLTO_FLAG@ - -include_HEADERS = proj.h proj_experimental.h proj_constants.h geodesic.h \ - proj_symbol_rename.h - -EXTRA_DIST = bin_cct.cmake bin_gie.cmake bin_cs2cs.cmake \ - bin_geod.cmake bin_proj.cmake bin_projinfo.cmake \ - lib_proj.cmake \ - check_md5sum.cmake \ - generate_wkt_parser.cmake \ - CMakeLists.txt \ - bin_geodtest.cmake \ - bin_projsync.cmake \ - tests/geodtest.cpp \ - wkt1_grammar.y wkt2_grammar.y apps/emess.h apps/utils.h \ - apps/projsync.cpp - -proj_SOURCES = apps/proj.cpp apps/emess.cpp apps/utils.cpp -invproj_SOURCES = $(proj_SOURCES) -projinfo_SOURCES = apps/projinfo.cpp -cs2cs_SOURCES = apps/cs2cs.cpp apps/emess.cpp apps/utils.cpp -cct_SOURCES = apps/cct.cpp apps/proj_strtod.cpp apps/proj_strtod.h apps/optargpm.h -geod_SOURCES = apps/geod.cpp apps/geod_set.cpp apps/geod_interface.cpp apps/geod_interface.h apps/emess.cpp -invgeod_SOURCES = $(geod_SOURCES) - -if HAVE_CURL -projsync_SOURCES = apps/projsync.cpp -projsync_LDADD = libproj.la -PROJSYNC_BIN = projsync -endif - -bin_PROGRAMS = proj geod cs2cs gie cct projinfo $(PROJSYNC_BIN) -noinst_PROGRAMS = invproj invgeod - -gie_SOURCES = apps/gie.cpp apps/proj_strtod.cpp apps/proj_strtod.h apps/optargpm.h -multistresstest_SOURCES = tests/multistresstest.cpp -geodtest_SOURCES = tests/geodtest.cpp - -cct_LDADD = libproj.la -cs2cs_LDADD = libproj.la -geod_LDADD = libproj.la -invgeod_LDADD = $(geod_LDADD) -proj_LDADD = libproj.la -invproj_LDADD = $(proj_LDADD) -projinfo_LDADD = libproj.la - -gie_LDADD = libproj.la -multistresstest_LDADD = libproj.la @THREAD_LIB@ -geodtest_LDADD = libproj.la - -lib_LTLIBRARIES = libproj.la - -libproj_la_LDFLAGS = -no-undefined -version-info 24:1:2 -libproj_la_LIBADD = @SQLITE3_LIBS@ @TIFF_LIBS@ @CURL_LIBS@ - -libproj_la_SOURCES = \ - pj_list.h proj_internal.h \ - \ - iso19111/static.cpp \ - iso19111/util.cpp \ - iso19111/metadata.cpp \ - iso19111/common.cpp \ - iso19111/crs.cpp \ - iso19111/datum.cpp \ - iso19111/coordinatesystem.cpp \ - iso19111/operation/concatenatedoperation.cpp \ - iso19111/operation/coordinateoperation_internal.hpp \ - iso19111/operation/coordinateoperation_private.hpp \ - iso19111/operation/coordinateoperationfactory.cpp \ - iso19111/operation/conversion.cpp \ - iso19111/operation/esriparammappings.hpp \ - iso19111/operation/esriparammappings.cpp \ - iso19111/operation/operationmethod_private.hpp \ - iso19111/operation/oputils.hpp \ - iso19111/operation/oputils.cpp \ - iso19111/operation/parammappings.hpp \ - iso19111/operation/parammappings.cpp \ - iso19111/operation/projbasedoperation.cpp \ - iso19111/operation/singleoperation.cpp \ - iso19111/operation/transformation.cpp \ - iso19111/operation/vectorofvaluesparams.hpp \ - iso19111/operation/vectorofvaluesparams.cpp \ - iso19111/io.cpp \ - iso19111/internal.cpp \ - iso19111/factory.cpp \ - iso19111/c_api.cpp \ - \ - projections/aeqd.cpp \ - projections/adams.cpp \ - projections/gnom.cpp \ - projections/laea.cpp \ - projections/mod_ster.cpp \ - projections/nsper.cpp \ - projections/nzmg.cpp \ - projections/ortho.cpp \ - projections/stere.cpp \ - projections/sterea.cpp \ - projections/aea.cpp \ - projections/bipc.cpp \ - projections/bonne.cpp \ - projections/eqdc.cpp \ - projections/isea.cpp \ - projections/ccon.cpp \ - projections/imw_p.cpp \ - projections/krovak.cpp \ - projections/lcc.cpp \ - projections/poly.cpp \ - projections/rpoly.cpp \ - projections/sconics.cpp \ - projections/rouss.cpp \ - projections/cass.cpp \ - projections/cc.cpp \ - projections/cea.cpp \ - projections/eqc.cpp \ - projections/gall.cpp \ - projections/labrd.cpp \ - projections/lsat.cpp \ - projections/misrsom.cpp \ - projections/merc.cpp \ - projections/mill.cpp \ - projections/ocea.cpp \ - projections/omerc.cpp \ - projections/somerc.cpp \ - projections/tcc.cpp \ - projections/tcea.cpp \ - projections/times.cpp \ - projections/tmerc.cpp \ - projections/tobmerc.cpp \ - projections/airy.cpp \ - projections/aitoff.cpp \ - projections/august.cpp \ - projections/bacon.cpp \ - projections/bertin1953.cpp \ - projections/chamb.cpp \ - projections/hammer.cpp \ - projections/lagrng.cpp \ - projections/larr.cpp \ - projections/lask.cpp \ - projections/latlong.cpp \ - projections/nicol.cpp \ - projections/ob_tran.cpp \ - projections/oea.cpp \ - projections/tpeqd.cpp \ - projections/vandg.cpp \ - projections/vandg2.cpp \ - projections/vandg4.cpp \ - projections/wag7.cpp \ - projections/lcca.cpp \ - projections/geos.cpp \ - projections/boggs.cpp \ - projections/collg.cpp \ - projections/comill.cpp \ - projections/crast.cpp \ - projections/denoy.cpp \ - projections/eck1.cpp \ - projections/eck2.cpp \ - projections/eck3.cpp \ - projections/eck4.cpp \ - projections/eck5.cpp \ - projections/fahey.cpp \ - projections/fouc_s.cpp \ - projections/gins8.cpp \ - projections/gstmerc.cpp \ - projections/gn_sinu.cpp \ - projections/goode.cpp \ - projections/igh.cpp \ - projections/igh_o.cpp \ - projections/hatano.cpp \ - projections/loxim.cpp \ - projections/mbt_fps.cpp \ - projections/mbtfpp.cpp \ - projections/mbtfpq.cpp \ - projections/moll.cpp \ - projections/nell.cpp \ - projections/nell_h.cpp \ - projections/patterson.cpp \ - projections/putp2.cpp \ - projections/putp3.cpp \ - projections/putp4p.cpp \ - projections/putp5.cpp \ - projections/putp6.cpp \ - projections/qsc.cpp \ - projections/robin.cpp \ - projections/s2.cpp \ - projections/sch.cpp \ - projections/sts.cpp \ - projections/urm5.cpp \ - projections/urmfps.cpp \ - projections/wag2.cpp \ - projections/wag3.cpp \ - projections/wink1.cpp \ - projections/wink2.cpp \ - projections/healpix.cpp \ - projections/natearth.cpp \ - projections/natearth2.cpp \ - projections/calcofi.cpp \ - projections/eqearth.cpp \ - projections/col_urban.cpp \ - \ - conversions/axisswap.cpp \ - conversions/cart.cpp \ - conversions/geoc.cpp \ - conversions/geocent.cpp \ - conversions/noop.cpp \ - conversions/topocentric.cpp \ - conversions/set.cpp \ - conversions/unitconvert.cpp \ - \ - transformations/affine.cpp \ - transformations/deformation.cpp \ - transformations/helmert.cpp \ - transformations/hgridshift.cpp \ - transformations/horner.cpp \ - transformations/molodensky.cpp \ - transformations/vgridshift.cpp \ - transformations/xyzgridshift.cpp \ - transformations/defmodel.cpp \ - transformations/defmodel.hpp \ - transformations/defmodel_exceptions.hpp \ - transformations/defmodel_impl.hpp \ - transformations/tinshift.cpp \ - transformations/tinshift.hpp \ - transformations/tinshift_exceptions.hpp \ - transformations/tinshift_impl.hpp \ - \ - aasincos.cpp adjlon.cpp \ - dmstor.cpp auth.cpp \ - deriv.cpp ell_set.cpp ellps.cpp \ - factors.cpp fwd.cpp init.cpp inv.cpp \ - list.cpp malloc.cpp mlfn.cpp mlfn.hpp msfn.cpp proj_mdist.cpp \ - param.cpp phi2.cpp pr_list.cpp \ - qsfn.cpp strerrno.cpp \ - tsfn.cpp units.cpp ctx.cpp log.cpp zpoly1.cpp rtodms.cpp \ - release.cpp gauss.cpp \ - generic_inverse.cpp \ - quadtree.hpp \ - \ - datums.cpp datum_set.cpp \ - mutex.cpp initcache.cpp geodesic.c \ - strtod.cpp \ - \ - 4D_api.cpp pipeline.cpp \ - internal.cpp \ - wkt_parser.hpp wkt_parser.cpp \ - wkt1_parser.h wkt1_parser.cpp \ - wkt1_generated_parser.h wkt1_generated_parser.c \ - wkt2_parser.h wkt2_parser.cpp \ - wkt2_generated_parser.h wkt2_generated_parser.c \ - \ - proj_json_streaming_writer.hpp \ - proj_json_streaming_writer.cpp \ - \ - tracing.cpp \ - \ - grids.hpp \ - grids.cpp \ - filemanager.hpp \ - filemanager.cpp \ - networkfilemanager.cpp \ - sqlite3_utils.hpp \ - sqlite3_utils.cpp - - -# The sed hack is to please MSVC -wkt1_parser: - bison --no-lines -d -p pj_wkt1_ -o$(top_srcdir)/src/wkt1_generated_parser.c $(top_srcdir)/src/wkt1_grammar.y - sed "s/\*yyssp = yystate/\*yyssp = (yytype_int16)yystate/" < $(top_srcdir)/src/wkt1_generated_parser.c | sed "s/yyerrorlab:/#if 0\nyyerrorlab:/" | sed "s/yyerrlab1:/#endif\nyyerrlab1:/" | sed "s/for (yylen = 0; yystr\[yylen\]; yylen++)/for (yylen = 0; yystr \&\& yystr\[yylen\]; yylen++)/" | sed "s/return yystpcpy (yyres, yystr) - yyres;/return (YYPTRDIFF_T)(yystpcpy (yyres, yystr) - yyres);/" | sed "s/YYPTRDIFF_T yysize = yyssp - yyss + 1;/YYPTRDIFF_T yysize = (YYPTRDIFF_T)(yyssp - yyss + 1);/" > $(top_srcdir)/src/wkt1_generated_parser.c.tmp - mv $(top_srcdir)/src/wkt1_generated_parser.c.tmp $(top_srcdir)/src/wkt1_generated_parser.c - -wkt2_parser: - bison --no-lines -d -p pj_wkt2_ -o$(top_srcdir)/src/wkt2_generated_parser.c $(top_srcdir)/src/wkt2_grammar.y - sed "s/\*yyssp = yystate/\*yyssp = (yytype_int16)yystate/" < $(top_srcdir)/src/wkt2_generated_parser.c | sed "s/yyerrorlab:/#if 0\nyyerrorlab:/" | sed "s/yyerrlab1:/#endif\nyyerrlab1:/" | sed "s/for (yylen = 0; yystr\[yylen\]; yylen++)/for (yylen = 0; yystr \&\& yystr\[yylen\]; yylen++)/"| sed "s/return yystpcpy (yyres, yystr) - yyres;/return (YYPTRDIFF_T)(yystpcpy (yyres, yystr) - yyres);/" | sed "s/YYPTRDIFF_T yysize = yyssp - yyss + 1;/YYPTRDIFF_T yysize = (YYPTRDIFF_T)(yyssp - yyss + 1);/"> $(top_srcdir)/src/wkt2_generated_parser.c.tmp - mv $(top_srcdir)/src/wkt2_generated_parser.c.tmp $(top_srcdir)/src/wkt2_generated_parser.c - -install-exec-local: install-binPROGRAMS - rm -f $(DESTDIR)$(bindir)/invproj$(EXEEXT) - (cd $(DESTDIR)$(bindir); ln -s proj$(EXEEXT) invproj$(EXEEXT)) - rm -f $(DESTDIR)$(bindir)/invgeod$(EXEEXT) - (cd $(DESTDIR)$(bindir); ln -s geod$(EXEEXT) invgeod$(EXEEXT)) diff --git a/test/Makefile.am b/test/Makefile.am deleted file mode 100644 index fa2c1e80..00000000 --- a/test/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -EXTRA_DIST = CMakeLists.txt - -# include_HEADERS = catch.hpp - -# lib_LTLIBRARIES = libtestmain.la - -# libtestmain_la_LDFLAGS = -no-undefined -# libtestmain_la_SOURCES = test_main.cpp - -if !USE_EXTERNAL_GTEST -MAYBE_GTEST = googletest -endif -SUBDIRS = cli $(MAYBE_GTEST) . gie gigs unit diff --git a/test/cli/Makefile.am b/test/cli/Makefile.am deleted file mode 100644 index bc840738..00000000 --- a/test/cli/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -# Executables paths passed to test scripts -PROJ_LIB = ../../data/for_tests -THIS_DIR = $(top_srcdir)/test/cli -EXEPATH = ../../src -PROJEXE = $(EXEPATH)/proj -INVPROJEXE = $(EXEPATH)/invproj -CS2CSEXE = $(EXEPATH)/cs2cs -PROJINFOEXE = $(EXEPATH)/projinfo -CCTEXE = $(EXEPATH)/cct -PROJSYNC_EXE = $(EXEPATH)/projsync - -# PROJ.4 test scripts -TEST27 = $(THIS_DIR)/test27 -TEST83 = $(THIS_DIR)/test83 -TESTPROJ = $(THIS_DIR)/testproj -TESTINVPROJ = $(THIS_DIR)/testinvproj -TESTNTV2 = $(THIS_DIR)/testntv2 -TESTVARIOUS = $(THIS_DIR)/testvarious -TESTFLAKY = $(THIS_DIR)/testflaky -TESTDATUMFILE = $(THIS_DIR)/testdatumfile -TESTIGN = $(THIS_DIR)/testIGNF -TESTPROJINFO = $(THIS_DIR)/testprojinfo -TESTCCT = $(THIS_DIR)/testcct -TESTPROJSYNC = $(THIS_DIR)/test_projsync - -EXTRA_DIST = pj_out27.dist pj_out83.dist td_out.dist \ - test27 test83 tv_out.dist tf_out.dist \ - testflaky testvarious testdatumfile testntv2 ntv2_out.dist \ - testIGNF proj_outIGNF.dist \ - testprojinfo testprojinfo_out.dist \ - testcct testcct_out.dist \ - testproj testproj_out.dist \ - testinvproj testinvproj_out.dist \ - test_projsync \ - CMakeLists.txt - -testprojinfo-check: - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTPROJINFO) $(PROJINFOEXE) - -test27-check: - PROJ_LIB=$(PROJ_LIB) $(TEST27) $(PROJEXE) - -test83-check: - PROJ_LIB=$(PROJ_LIB) $(TEST83) $(PROJEXE) - -testproj-check: - PROJ_LIB=$(PROJ_LIB) $(TESTPROJ) $(PROJEXE) - -testinvproj-check: - PROJ_LIB=$(PROJ_LIB) $(TESTINVPROJ) $(INVPROJEXE) - -testvarious-check: - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTVARIOUS) $(CS2CSEXE) - -testdatumfile-check: - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTDATUMFILE) $(CS2CSEXE) - -testign-check: - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTIGN) $(CS2CSEXE) - -testntv2-check: - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTNTV2) $(CS2CSEXE) - -testcct-check: - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(TESTCCT) $(CCTEXE) - - -if HAVE_CURL -testprojsync-check: - PROJ_LIB=$(PROJ_LIB) $(TESTPROJSYNC) $(PROJSYNC_EXE) -else -testprojsync-check: - echo "Skipping testprojsync-check" -endif - -check-local: testprojinfo-check test27-check test83-check testproj-check testinvproj-check testvarious-check testdatumfile-check testign-check testntv2-check testcct-check testprojsync-check diff --git a/test/gie/Makefile.am b/test/gie/Makefile.am deleted file mode 100644 index 70d55744..00000000 --- a/test/gie/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -EXEPATH = ../../src -GIEEXE = $(EXEPATH)/gie - -EXTRA_DIST = 4D-API_cs2cs-style.gie \ - GDA.gie \ - axisswap.gie \ - builtins.gie \ - deformation.gie \ - ellipsoid.gie \ - more_builtins.gie \ - unitconvert.gie \ - DHDN_ETRS89.gie \ - geotiff_grids.gie \ - adams_hemi.gie \ - adams_ws1.gie \ - adams_ws2.gie \ - guyou.gie \ - peirce_q.gie \ - defmodel.gie \ - tinshift.gie \ - nkg.gie - -PROJ_LIB ?= ../../data/for_tests - -4D-API-cs2cs-style: 4D-API_cs2cs-style.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -GDA: GDA.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -axisswap: axisswap.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -builtins: builtins.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -deformation: deformation.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -ellipsoid: ellipsoid.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -more_builtins: more_builtins.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -unitconvert: unitconvert.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -DHDN_ETRS89: DHDN_ETRS89.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -geotiff_grids: geotiff_grids.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -adams_hemi: adams_hemi.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -adams_ws1: adams_ws1.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -adams_ws2: adams_ws2.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -guyou: guyou.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -peirce_q: peirce_q.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -defmodel: defmodel.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -tinshift: tinshift.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -check-local: 4D-API-cs2cs-style GDA axisswap builtins deformation ellipsoid more_builtins unitconvert DHDN_ETRS89 geotiff_grids adams_hemi adams_ws1 adams_ws2 guyou peirce_q defmodel tinshift diff --git a/test/gigs/Makefile.am b/test/gigs/Makefile.am deleted file mode 100644 index 2bdff3f2..00000000 --- a/test/gigs/Makefile.am +++ /dev/null @@ -1,80 +0,0 @@ -EXEPATH = ../../src -GIEEXE = $(EXEPATH)/gie - -EXTRA_DIST = \ - 5101.1-jhs.gie \ - 5101.2-jhs.gie \ - 5101.3-jhs.gie \ - 5101.4-jhs-etmerc.gie \ - 5102.1.gie \ - 5103.1.gie \ - 5103.2.gie \ - 5103.3.gie \ - 5104.gie \ - 5105.2.gie \ - 5106.gie \ - 5107.gie \ - 5109.gie \ - 5111.1.gie \ - 5112.gie \ - 5113.gie \ - 5201.gie \ - 5208.gie - -PROJ_LIB ?= ../../data/for_tests - -5101.1: 5101.1-jhs.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5101.2: 5101.2-jhs.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5101.3: 5101.3-jhs.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5101.4: 5101.4-jhs-etmerc.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5102.1: 5102.1.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5103.1: 5103.1.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5103.2: 5103.2.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5103.3: 5103.3.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5104: 5104.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5105.2: 5105.2.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5106: 5106.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5107: 5107.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5109: 5109.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5111.1: 5111.1.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5112: 5112.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5113: 5113.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5201: 5201.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -5208: 5208.gie - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) $(GIEEXE) $< - -check-local: 5101.1 5101.2 5101.3 5101.4 5102.1 5103.1 5103.2 5103.3 5104 5105.2 5106 5107 5109 5111.1 5112 5113 5201 5208 diff --git a/test/googletest/Makefile.am b/test/googletest/Makefile.am deleted file mode 100644 index 88e6241d..00000000 --- a/test/googletest/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects - -SUBDIRS = src include - -AM_CPPFLAGS = -I$(top_srcdir)/test/googletest/include - -noinst_LTLIBRARIES = libgtest.la - -libgtest_la_LDFLAGS = -no-undefined -libgtest_la_SOURCES = src/gtest-all.cc - -EXTRA_DIST = CMakeLists.txt.in diff --git a/test/googletest/include/Makefile.am b/test/googletest/include/Makefile.am deleted file mode 100644 index b1f917b2..00000000 --- a/test/googletest/include/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = gtest diff --git a/test/googletest/include/gtest/Makefile.am b/test/googletest/include/gtest/Makefile.am deleted file mode 100644 index 31af347b..00000000 --- a/test/googletest/include/gtest/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -SUBDIRS = internal -EXTRA_DIST = \ - gtest-death-test.h \ - gtest.h \ - gtest-message.h \ - gtest-param-test.h \ - gtest-param-test.h.pump \ - gtest_pred_impl.h \ - gtest-printers.h \ - gtest_prod.h \ - gtest-spi.h \ - gtest-test-part.h \ - gtest-typed-test.h diff --git a/test/googletest/include/gtest/internal/Makefile.am b/test/googletest/include/gtest/internal/Makefile.am deleted file mode 100644 index a6da4313..00000000 --- a/test/googletest/include/gtest/internal/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -SUBDIRS = custom - -EXTRA_DIST = \ - gtest-death-test-internal.h \ - gtest-filepath.h \ - gtest-internal.h \ - gtest-linked_ptr.h \ - gtest-param-util-generated.h \ - gtest-param-util-generated.h.pump \ - gtest-param-util.h \ - gtest-port-arch.h \ - gtest-port.h \ - gtest-string.h \ - gtest-tuple.h \ - gtest-tuple.h.pump \ - gtest-type-util.h \ - gtest-type-util.h.pump diff --git a/test/googletest/include/gtest/internal/custom/Makefile.am b/test/googletest/include/gtest/internal/custom/Makefile.am deleted file mode 100644 index f8affb3c..00000000 --- a/test/googletest/include/gtest/internal/custom/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -EXTRA_DIST = \ - gtest.h \ - gtest-port.h \ - gtest-printers.h diff --git a/test/googletest/src/Makefile.am b/test/googletest/src/Makefile.am deleted file mode 100644 index 45f9ad08..00000000 --- a/test/googletest/src/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -EXTRA_DIST = \ - gtest-all.cc \ - gtest.cc \ - gtest-death-test.cc \ - gtest-filepath.cc \ - gtest_main.cc \ - gtest-port.cc \ - gtest-printers.cc \ - gtest-test-part.cc \ - gtest-typed-test.cc \ - gtest-internal-inl.h - diff --git a/test/postinstall/c_app/configure.ac b/test/postinstall/c_app/configure.ac index 43ae4835..6224ee4f 100644 --- a/test/postinstall/c_app/configure.ac +++ b/test/postinstall/c_app/configure.ac @@ -1,7 +1,7 @@ AC_INIT([c_app], [0.1]) AM_INIT_AUTOMAKE AC_PROG_CC -AC_CONFIG_MACRO_DIR([../../../m4]) +AC_CONFIG_MACRO_DIR([../m4]) PKG_CHECK_MODULES([PROJ], [proj]) diff --git a/test/postinstall/cpp_app/configure.ac b/test/postinstall/cpp_app/configure.ac index 7da902a8..39eca0dc 100644 --- a/test/postinstall/cpp_app/configure.ac +++ b/test/postinstall/cpp_app/configure.ac @@ -2,7 +2,7 @@ AC_INIT([cpp_app], [0.1]) AM_INIT_AUTOMAKE AC_PROG_CXX dnl Required for (e.g.) g++-4.8 -AC_CONFIG_MACRO_DIR([../../../m4]) +AC_CONFIG_MACRO_DIR([../m4]) AX_CXX_COMPILE_STDCXX_11([noext],[mandatory]) PKG_CHECK_MODULES([PROJ], [proj]) diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/test/postinstall/m4/ax_cxx_compile_stdcxx.m4 index 1bff58a5..1bff58a5 100644 --- a/m4/ax_cxx_compile_stdcxx.m4 +++ b/test/postinstall/m4/ax_cxx_compile_stdcxx.m4 diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/test/postinstall/m4/ax_cxx_compile_stdcxx_11.m4 index 0aadeafe..0aadeafe 100644 --- a/m4/ax_cxx_compile_stdcxx_11.m4 +++ b/test/postinstall/m4/ax_cxx_compile_stdcxx_11.m4 diff --git a/m4/pkg.m4 b/test/postinstall/m4/pkg.m4 index 452488c8..452488c8 100644 --- a/m4/pkg.m4 +++ b/test/postinstall/m4/pkg.m4 diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am deleted file mode 100644 index 9ca3a723..00000000 --- a/test/unit/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects - -EXTRA_DIST = CMakeLists.txt - -noinst_HEADERS = gtest_include.h test_primitives.hpp - -AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/test @GTEST_CFLAGS@ @SQLITE3_CFLAGS@ -DMUTEX_@MUTEX_SETTING@ -AM_CXXFLAGS = @CXX_WFLAGS@ @NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG@ - -PROJ_LIB ?= ../../data/for_tests - -noinst_PROGRAMS = pj_phi2_test -noinst_PROGRAMS += proj_errno_string_test -noinst_PROGRAMS += proj_angular_io_test -noinst_PROGRAMS += proj_context_test -noinst_PROGRAMS += test_cpp_api -noinst_PROGRAMS += gie_self_tests -noinst_PROGRAMS += include_proj_h_from_c -noinst_PROGRAMS += test_network -noinst_PROGRAMS += test_defmodel -noinst_PROGRAMS += test_tinshift -noinst_PROGRAMS += test_misc -noinst_PROGRAMS += test_fork - -pj_phi2_test_SOURCES = pj_phi2_test.cpp main.cpp -pj_phi2_test_LDADD = ../../src/libproj.la @GTEST_LIBS@ - -pj_phi2_test-check: pj_phi2_test - ./pj_phi2_test - -proj_errno_string_test_SOURCES = proj_errno_string_test.cpp main.cpp -proj_errno_string_test_LDADD= ../../src/libproj.la @GTEST_LIBS@ - -proj_errno_string_test-check: proj_errno_string_test - ./proj_errno_string_test - -proj_angular_io_test_SOURCES = proj_angular_io_test.cpp main.cpp -proj_angular_io_test_LDADD = ../../src/libproj.la @GTEST_LIBS@ - -proj_angular_io_test-check: proj_angular_io_test - ./proj_angular_io_test - -proj_context_test_SOURCES = proj_context_test.cpp main.cpp -proj_context_test_LDADD = ../../src/libproj.la @GTEST_LIBS@ - -proj_context_test-check: proj_context_test - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES ./proj_context_test - -test_cpp_api_SOURCES = test_util.cpp \ - test_common.cpp \ - test_crs.cpp \ - test_metadata.cpp \ - test_io.cpp \ - test_operation.cpp \ - test_operationfactory.cpp \ - test_datum.cpp \ - test_factory.cpp \ - test_c_api.cpp \ - test_grids.cpp \ - main.cpp -test_cpp_api_LDADD = ../../src/libproj.la @GTEST_LIBS@ @SQLITE3_LIBS@ - -test_cpp_api-check: test_cpp_api - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) ./test_cpp_api - -gie_self_tests_SOURCES = gie_self_tests.cpp main.cpp -gie_self_tests_LDADD = ../../src/libproj.la @GTEST_LIBS@ @SQLITE3_LIBS@ - -gie_self_tests-check: gie_self_tests - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) ./gie_self_tests - -include_proj_h_from_c_SOURCES = include_proj_h_from_c.c - -test_network_SOURCES = test_network.cpp main.cpp -test_network_CXXFLAGS = @CURL_CFLAGS@ @CURL_ENABLED_FLAGS@ -test_network_LDADD = ../../src/libproj.la @GTEST_LIBS@ @SQLITE3_LIBS@ @CURL_LIBS@ - -test_network-check: test_network - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES PROJ_LIB=$(PROJ_LIB) PROJ_SOURCE_DATA=$(PROJ_LIB) ./test_network - -test_defmodel_SOURCES = test_defmodel.cpp main.cpp -test_defmodel_LDADD = ../../src/libproj.la @GTEST_LIBS@ - -test_defmodel-check: test_defmodel - PROJ_LIB=$(PROJ_LIB) ./test_defmodel - -test_tinshift_SOURCES = test_tinshift.cpp main.cpp -test_tinshift_LDADD = ../../src/libproj.la @GTEST_LIBS@ - -test_tinshift-check: test_tinshift - PROJ_LIB=$(PROJ_LIB) ./test_tinshift - -test_misc_SOURCES = test_misc.cpp main.cpp -test_misc_LDADD = ../../src/libproj.la @GTEST_LIBS@ - -test_misc-check: test_misc - PROJ_LIB=$(PROJ_LIB) ./test_misc - -test_fork_SOURCES = test_fork.c -test_fork_LDADD = ../../src/libproj.la @THREAD_LIB@ - -test_fork-check: test_fork - PROJ_LIB=$(PROJ_LIB) ./test_fork - -check-local: pj_phi2_test-check proj_errno_string_test-check \ - proj_angular_io_test-check proj_context_test-check test_cpp_api-check \ - gie_self_tests-check test_network-check test_defmodel-check test_tinshift-check \ - test_misc-check test_fork-check |