Merge pull request #1364 from dwcaress/caress-tmp

Fixed build bugs for both Autotools and CMake
dwcaress · Jun 15, 2023 · 62a2b07 · 62a2b07
2 parents b9abd29 + 530489e
commit 62a2b07
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 56 deletions.
diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for mbsystem 5.7.9beta53.
+# Generated by GNU Autoconf 2.71 for mbsystem 5.7.9beta54.
 #
 # Report bugs to <http://listserver.mbari.org/sympa/arc/mbsystem>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mbsystem'
 PACKAGE_TARNAME='mbsystem'
-PACKAGE_VERSION='5.7.9beta53'
-PACKAGE_STRING='mbsystem 5.7.9beta53'
+PACKAGE_VERSION='5.7.9beta54'
+PACKAGE_STRING='mbsystem 5.7.9beta54'
 PACKAGE_BUGREPORT='http://listserver.mbari.org/sympa/arc/mbsystem'
 PACKAGE_URL='http://www.mbari.org/data/mbsystem/'
 
@@ -1536,7 +1536,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mbsystem 5.7.9beta53 to adapt to many kinds of systems.
+\`configure' configures mbsystem 5.7.9beta54 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1611,7 +1611,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mbsystem 5.7.9beta53:";;
+     short | recursive ) echo "Configuration of mbsystem 5.7.9beta54:";;
    esac
   cat <<\_ACEOF
 
@@ -1789,7 +1789,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mbsystem configure 5.7.9beta53
+mbsystem configure 5.7.9beta54
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2325,7 +2325,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mbsystem $as_me 5.7.9beta53, which was
+It was created by mbsystem $as_me 5.7.9beta54, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -5396,7 +5396,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mbsystem'
- VERSION='5.7.9beta53'
+ VERSION='5.7.9beta54'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -26069,7 +26069,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mbsystem $as_me 5.7.9beta53, which was
+This file was extended by mbsystem $as_me 5.7.9beta54, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26138,7 +26138,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-mbsystem config.status 5.7.9beta53
+mbsystem config.status 5.7.9beta54
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ dnl    See README file for copying and redistribution conditions.
 dnl--------------------------------------------------------------------
 
 dnl Initialize and set version and version date
-AC_INIT([mbsystem],[5.7.9beta53],[http://listserver.mbari.org/sympa/arc/mbsystem],[mbsystem],[http://www.mbari.org/data/mbsystem/])
+AC_INIT([mbsystem],[5.7.9beta54],[http://listserver.mbari.org/sympa/arc/mbsystem],[mbsystem],[http://www.mbari.org/data/mbsystem/])
 AC_DEFINE(VERSION_DATE, ["15 June 2023"], [Set VERSION_DATE define in mb_config.h])
 
 AS_ECHO([" "])

diff --git a/src/bsio/mbbs_defines.h b/src/bsio/mbbs_defines.h
@@ -37,31 +37,31 @@
 /* CMake build system section */
 #ifdef CMAKE_BUILD_SYSTEM
 
-#  include <rpc/rpc.h>
-#  include <rpc/types.h>
-#  include <rpc/xdr.h>
+  #include <rpc/rpc.h>
+  #include <rpc/types.h>
+  #include <rpc/xdr.h>
 
 #else // Begin Autotools section supporting legacy OS's
 
-#ifndef _WIN32
-#include <sys/time.h>
-#endif
-
-#include <mb_config.h>
-
-/* XDR i/o include file */
-#ifdef HAVE_RPC_RPC_H
-#include <rpc/rpc.h>
-#endif
-#ifdef HAVE_RPC_TYPES_H
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#endif
-
-#ifdef _WIN32
-#include <float.h>
-#define isnan _isnan
-#endif
+  #ifndef _WIN32
+    #include <sys/time.h>
+  #endif
+
+  #include <mb_config.h>
+
+  /* XDR i/o include file */
+  #ifdef HAVE_RPC_RPC_H
+    #include <rpc/rpc.h>
+  #endif
+  #ifdef HAVE_RPC_TYPES_H
+    #include <rpc/types.h>
+    #include <rpc/xdr.h>
+  #endif
+
+  #ifdef _WIN32
+    #include <float.h>
+    #define isnan _isnan
+  #endif
 
 #endif // End Autotools section
 

diff --git a/src/bsio/mbbs_io.c b/src/bsio/mbbs_io.c
@@ -31,10 +31,6 @@
    io.c --
    I/O routines for Hawaii Mapping Research Group BS files.
 */
-#ifdef HAVE_CONFIG_H
-#include <mb_config.h>
-#endif
-
 #include <stdio.h>
 #include <string.h>
 #include <math.h>

diff --git a/src/gmt/mbcontour.c b/src/gmt/mbcontour.c
@@ -104,7 +104,8 @@
 
 #define GMT_PROG_OPTIONS "->BJKOPRUVXY" GMT_OPT("S")
 
-// Stop warnings about packaging collision between GDAL's cpl_port.h and mb_config.h
+// Stop warnings about packaging collision between GDAL's cpl_port.h and the 
+// Autotools build system mb_config.h
 #ifdef PACKAGE_BUGREPORT
 #undef PACKAGE_BUGREPORT
 #endif

diff --git a/src/gmt/mbgrd2obj.c b/src/gmt/mbgrd2obj.c
@@ -29,8 +29,9 @@
 
 #include "mb_define.h"
 
-// include gmt_def.h but first undefine PACKAGE variables to prevent
-// warnings about name collision between GDAL's cpl_port.h and mb_config.h
+// include gmt_dev.h but first undefine PACKAGE variables to prevent
+// warnings about name collision between GDAL's cpl_port.h and the 
+// Autotools build system mb_config.h
 #ifdef PACKAGE_BUGREPORT
 #undef PACKAGE_BUGREPORT
 #endif

diff --git a/src/gmt/mbgrdtiff.c b/src/gmt/mbgrdtiff.c
@@ -219,8 +219,9 @@
 #include "mb_format.h"
 #include "mb_define.h"
 
-// include gmt_def.h but first undefine PACKAGE variables to prevent
-// warnings about name collision between GDAL's cpl_port.h and mb_config.h
+// include gmt_dev.h but first undefine PACKAGE variables to prevent
+// warnings about name collision between GDAL's cpl_port.h and the 
+// Autotools build system mb_config.hmb_config.h
 #ifdef PACKAGE_BUGREPORT
 #undef PACKAGE_BUGREPORT
 #endif

diff --git a/src/gmt/mbswath.c b/src/gmt/mbswath.c
@@ -86,7 +86,8 @@
 #define gmt_show_name_and_purpose GMT_show_name_and_purpose
 #endif
 
-// Stop warnings about packaging collision between GDAL's cpl_port.h and mb_config.h
+// Stop warnings about packaging collision between GDAL's cpl_port.h and the 
+// Autotools build system mb_config.h
 #ifdef PACKAGE_BUGREPORT
 #undef PACKAGE_BUGREPORT
 #endif

diff --git a/src/mbaux/mb_readwritegrd.c b/src/mbaux/mb_readwritegrd.c
@@ -27,8 +27,11 @@
 #include <unistd.h>
 
 #include "gmt_dev.h"
-#ifdef HAVE_SINCOS
-#undef HAVE_SINCOS  // avoid clash between gmt_config.h and mb_config.h
+
+#ifndef CMAKE_BUILD_SYSTEM
+  #ifdef HAVE_SINCOS
+    #undef HAVE_SINCOS  // avoid clash between gmt_config.h and the Autotools build system mb_config.h
+  #endif
 #endif
 
 #include "mb_aux.h"

diff --git a/src/mbedit/mbedit_bxutils.c b/src/mbedit/mbedit_bxutils.c
@@ -7,7 +7,6 @@
 #include <strings.h>
 #include <wchar.h>
 
-#include <mb_config.h>
 #include <Xm/Xm.h>
 #include <Xm/RowColumn.h>
 

diff --git a/src/mbnavadjust/mbnavadjust_util.c b/src/mbnavadjust/mbnavadjust_util.c
@@ -5,8 +5,6 @@
 #include <string.h>
 #include <strings.h>
 
-#include <mb_config.h>
-
 /* Need to include windows.h BEFORE the the Xm stuff otherwise VC14+ barf with conflicts */
 #if defined(_MSC_VER) && (_MSC_VER >= 1900)
 #	ifndef WIN32

diff --git a/src/mbnavedit/mbnavedit_util.c b/src/mbnavedit/mbnavedit_util.c
@@ -12,8 +12,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <mb_config.h>
-
 /* Need to include windows.h BEFORE the the Xm stuff otherwise VC14+ barf with conflicts */
 #if defined(_MSC_VER) && (_MSC_VER >= 1900)
 #	ifndef WIN32

diff --git a/src/mbtrnav/Makefile.am b/src/mbtrnav/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libgeolib.la libnewmat.la libqnx.la libtnav.la libtrnw.la libnetif.la libmb1.la
 
-LIBMBTRNFRAME = $(top_builddir)/src/mbtrnframe/LIBMBTRNFRAME.la
+LIBMBTRNFRAME = $(top_builddir)/src/mbtrnframe/libmbtrnframe.la
 MBTRNFRAME_INC = -I${top_srcdir}/src/mbtrnframe
 
 

diff --git a/src/mbtrnav/Makefile.in b/src/mbtrnav/Makefile.in
@@ -752,7 +752,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 lib_LTLIBRARIES = libgeolib.la libnewmat.la libqnx.la libtnav.la libtrnw.la libnetif.la libmb1.la
-LIBMBTRNFRAME = $(top_builddir)/src/mbtrnframe/LIBMBTRNFRAME.la
+LIBMBTRNFRAME = $(top_builddir)/src/mbtrnframe/libmbtrnframe.la
 MBTRNFRAME_INC = -I${top_srcdir}/src/mbtrnframe
 AM_CFLAGS = ${libgmt_CFLAGS} ${libnetcdf_CFLAGS}
 #AM_CPPFLAGS += -DWITH_ALT_DELTAT_VALIDATION

diff --git a/src/mbvelocitytool/mbvelocity_bxutils.c b/src/mbvelocitytool/mbvelocity_bxutils.c
@@ -6,11 +6,9 @@
 #include <strings.h>
 
 #include <Xm/Xm.h>
-#include <mb_config.h>
 
 #include <Xm/RowColumn.h>
 
-
 /*****************************************************************************
  *       TYPDEFS AND DEFINES
  *****************************************************************************/

diff --git a/src/mbview/mbview_bxutils.c b/src/mbview/mbview_bxutils.c
@@ -6,8 +6,6 @@
 #include <string.h>
 #include <strings.h>
 
-#include <mb_config.h>
-
 #include <Xm/Xm.h>
 #include <Xm/RowColumn.h>