Merge pull request #821 from dwcaress/caress-tmp

Trying again to get build to work with proj 4

ChangeLog.md

@@ -372,6 +372,12 @@ mbinfo in this way, allowing a speedup of the mbprocess execution.
 
 mbgrid: Added data min max values to the per file shell output when verbose > 0
 
+mbsvpselect: This program depends on geodesic calculations that are now part of
+the Proj software package (from version 6 onwards). Previously the src/utilities
+directory had included the files geodetic.h and geodetic.c to provide this capability;
+those are now not included. Consequently, if MB-System is built with Proj versions 4 or 5,
+then mbsvpselect will not be built.
+
 Code style: Kurt Schwehr is systematically altering the code to conform to best practices and adding build tests. The tests are performed by running
     make check
 and are executed automatically by the Travis CI service integrated with Github

configure.cmd

@@ -378,8 +378,7 @@ autoupdate
 autoreconf --force --install --warnings=all
 
 LDFLAGS="-L/opt/X11/lib" \
-CFLAGS="-g -I/opt/X11/include -DWITH_GCTP_SINCOS" \
-CXXFLAGS="-std=c++11" \
+CFLAGS="-g -I/opt/X11/include" \
 ./configure \
     --prefix=/usr/local \
     --with-proj-include=/usr/local/opt/proj/include \

libtool

@@ -165,7 +165,7 @@ lock_old_archive_extraction=yes
 LTCC="gcc"
 
 # LTCC compiler flags.
-LTCFLAGS="-g -I/opt/X11/include -DWITH_GCTP_SINCOS"
+LTCFLAGS="-g -I/opt/X11/include"
 
 # Take the output of nm and produce a listing of raw symbols and C names.
 global_symbol_pipe="sed -n -e 's/^.*[	 ]\\([BCDEGRST][BCDEGRST]*\\)[	 ][	 ]*_\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 _\\2 \\2/p' | sed '/ __gnu_lto/d'"

src/utilities/Makefile.am

@@ -1,7 +1,9 @@
 if BUILD_FFTW
- FFTW_PROG = mbsegypsd
+  FFTW_PROG = mbsegypsd
+endif
+if BUILD_MBSVPSELECT
+  MBSVPSELECT_PROG = mbsvpselect
 endif
-
 if BUILD_MBTRN
   MBTRNINCDIR = -I${top_srcdir}/src/mbtrn/r7kr -I${top_srcdir}/src/mbtrn/utils -I${top_srcdir}/src/mbtrn/mframe/src
 endif
@@ -42,7 +44,7 @@ bin_PROGRAMS += mbsegylist
 bin_PROGRAMS += mbset
 bin_PROGRAMS += mbsslayout
 bin_PROGRAMS += mbsvplist
-bin_PROGRAMS += mbsvpselect
+bin_PROGRAMS += $(MBSVPSELECT_PROG)
 bin_PROGRAMS += mbtime
 bin_PROGRAMS += mbvoxelclean
 bin_PROGRAMS += $(FFTW_PROG)

src/utilities/Makefile.in

@@ -102,8 +102,8 @@ bin_PROGRAMS = mbconfig$(EXEEXT) mbabsorption$(EXEEXT) \
 	mbrolltimelag$(EXEEXT) mbroutetime$(EXEEXT) \
 	mbsegygrid$(EXEEXT) mbsegyinfo$(EXEEXT) mbsegylist$(EXEEXT) \
 	mbset$(EXEEXT) mbsslayout$(EXEEXT) mbsvplist$(EXEEXT) \
-	mbsvpselect$(EXEEXT) mbtime$(EXEEXT) mbvoxelclean$(EXEEXT) \
-	$(am__EXEEXT_1)
+	$(am__EXEEXT_1) mbtime$(EXEEXT) mbvoxelclean$(EXEEXT) \
+	$(am__EXEEXT_2)
 @BUILD_GSF_TRUE@am__append_1 = -I${top_srcdir}/src/gsf
 subdir = src/utilities
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -120,7 +120,8 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/mbio/mb_config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-@BUILD_FFTW_TRUE@am__EXEEXT_1 = mbsegypsd$(EXEEXT)
+@BUILD_MBSVPSELECT_TRUE@am__EXEEXT_1 = mbsvpselect$(EXEEXT)
+@BUILD_FFTW_TRUE@am__EXEEXT_2 = mbsegypsd$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_mbabsorption_OBJECTS = mbabsorption.$(OBJEXT)
@@ -556,6 +557,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @BUILD_FFTW_TRUE@FFTW_PROG = mbsegypsd
+@BUILD_MBSVPSELECT_TRUE@MBSVPSELECT_PROG = mbsvpselect
 @BUILD_MBTRN_TRUE@MBTRNINCDIR = -I${top_srcdir}/src/mbtrn/r7kr -I${top_srcdir}/src/mbtrn/utils -I${top_srcdir}/src/mbtrn/mframe/src
 include_HEADERS = levitus.h
 AM_CFLAGS = ${libgmt_CFLAGS} ${libnetcdf_CFLAGS}

test/utilities/Makefile.am

@@ -113,7 +113,7 @@ check_SCRIPTS += mbsslayout_test.py
 TESTS += mbsvplist_test.py
 check_SCRIPTS += mbsvplist_test.py
 
-if BUILDMBSVPSELECT
+if BUILD_MBSVPSELECT
 TESTS += mbsvpselect_test.py
 check_SCRIPTS += mbsvpselect_test.py
 endif

test/utilities/Makefile.in

@@ -87,6 +87,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@BUILD_MBSVPSELECT_TRUE@am__append_1 = mbsvpselect_test.py
+@BUILD_MBSVPSELECT_TRUE@am__append_2 = mbsvpselect_test.py
 subdir = test/utilities
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
@@ -514,7 +516,7 @@ TESTS = mbabsorption_test.py mbareaclean_test.py mbauvloglist_test.py \
 	mbrolltimelag_test.py mbroutetime_test.py mbsegygrid_test.py \
 	mbsegyinfo_test.py mbsegylist_test.py mbsegypsd_test.py \
 	mbset_test.py mbsslayout_test.py mbsvplist_test.py \
-	mbsvpselect_test.py mbtime_test.py mbvoxelclean_test.py
+	$(am__append_1) mbtime_test.py mbvoxelclean_test.py
 
 # if HAVE_PYTHON
 check_SCRIPTS = mbabsorption_test.py mbareaclean_test.py \
@@ -529,7 +531,7 @@ check_SCRIPTS = mbabsorption_test.py mbareaclean_test.py \
 	mbprocess_test.py mbrolltimelag_test.py mbroutetime_test.py \
 	mbsegygrid_test.py mbsegyinfo_test.py mbsegylist_test.py \
 	mbsegypsd_test.py mbset_test.py mbsslayout_test.py \
-	mbsvplist_test.py mbsvpselect_test.py mbtime_test.py \
+	mbsvplist_test.py $(am__append_2) mbtime_test.py \
 	mbvoxelclean_test.py
 all: all-am