Merge remote-tracking branch 'canonical/develop' into copying_to_license

config/clang-flags

@@ -116,14 +116,8 @@ if test "X-clang" = "X-$cc_vendor" -o "X-Apple LLVM" = "X-$cc_vendor"; then
     esac
 
     case "$host_os-$host_cpu" in
-        # cygwin needs the "-std=c99" flag removed, so make
-        # a specific case for Cygwin without the flag and a default
-        # case to add the flag everywhere else
-        cygwin-*)
-            ;;
-
         *)
-            H5_CFLAGS="$H5_CFLAGS -std=c99"
+            H5_CFLAGS="$H5_CFLAGS -std=c11"
             ;;
     esac
 

config/cmake/HDFCompilerFlags.cmake

@@ -9,10 +9,10 @@
 # If you do not have access to either file, you may request a copy from
 # [email protected].
 #
-set (CMAKE_C_STANDARD 99)
+set (CMAKE_C_STANDARD 11)
 set (CMAKE_C_STANDARD_REQUIRED TRUE)
 
-set (CMAKE_C_FLAGS "${CMAKE_C99_STANDARD_COMPILE_OPTION} ${CMAKE_C_FLAGS}")
+set (CMAKE_C_FLAGS "${CMAKE_C11_STANDARD_COMPILE_OPTION} ${CMAKE_C_FLAGS}")
 set (CMAKE_C_FLAGS "${CMAKE_C_SANITIZER_FLAGS} ${CMAKE_C_FLAGS}")
 message (VERBOSE "Warnings Configuration: C default: ${CMAKE_C_FLAGS}")
 #-----------------------------------------------------------------------------

config/gnu-flags

@@ -117,18 +117,15 @@ if test "X-gcc" = "X-$cc_vendor"; then
     esac
 
     case "$host_os-$host_cpu" in
-        # Cygwin needs the "-std=c99" flag removed.
-        cygwin-*)
-            ;;
-        # On Solaris, gcc needs the gnu99 standard to pick up certain POSIX
+        # On Solaris, gcc needs the gnu11 standard to pick up certain POSIX
         # things. Do NOT use this as the gcc norm as this encourages the use
         # of non-standard gcc extensions.
         *solaris*)
-            H5_CFLAGS="$H5_CFLAGS -std=gnu99"
+            H5_CFLAGS="$H5_CFLAGS -std=gnu11"
             ;;
-        # Everybody else gets c99 as the standard.
+        # Everybody else gets C11 as the standard.
         *)
-            H5_CFLAGS="$H5_CFLAGS -std=c99"
+            H5_CFLAGS="$H5_CFLAGS -std=c11"
             ;;
     esac
 

config/nvidia-flags

@@ -68,8 +68,8 @@ if test "X-nvc" = "X-$cc_vendor" -o "X-nvcc" = "X-$cc_vendor"; then
     # General #
     ###########
 
-    # Default to C99 standard.
-    H5_CFLAGS="$H5_CFLAGS $arch -c99 -Minform=warn"
+    # Default to C11 standard.
+    H5_CFLAGS="$H5_CFLAGS $arch -std=c11 -Minform=warn"
 
     ##############
     # Production #

config/oneapi-flags

@@ -80,8 +80,8 @@ if test "X-icx" = "X-$cc_vendor"; then
     # General #
     ###########
 
-    # Default to C99 standard.
-    H5_CFLAGS="$H5_CFLAGS $arch -std=c99"
+    # Default to C11 standard.
+    H5_CFLAGS="$H5_CFLAGS $arch -std=c11"
 
     ##############
     # Production #

configure.ac

@@ -1154,7 +1154,6 @@ AC_LANG_POP(C++)
 ## library is disabled.
 AC_SUBST([HDF5_HL])
 AC_SUBST([HDF5_HL_TOOLS])
-AC_SUBST([HDF5_HL_GIF_TOOLS])
 
 ## The high-level library and high-level tools are enabled unless the build mode
 ## is clean.
@@ -1477,27 +1476,6 @@ AC_ARG_ENABLE([tools],
 
 AC_MSG_RESULT([$HDF5_TOOLS])
 
-## ----------------------------------------------------------------------
-## Check if they would like to disable building the high-level GIF
-## tools (they have unfixed CVE issues)
-##
-
-AC_MSG_CHECKING([if the high-level GIF tools are enabled])
-AC_ARG_ENABLE([hlgiftools],
-     [AS_HELP_STRING([--enable-hlgiftools],
-                     [Enable the high-level GIF tools. NOTE: These have unfixed CVE issues!
-                     [default=no]
-                     ])],
-     [HDF5_HL_GIF_TOOLS=$enableval])
-
-if test "X-$HDF5_TOOLS" = "X-yes" -a "X-$HDF5_HL" = "X-yes" -a "X-$HDF5_HL_GIF_TOOLS" = "X-yes"; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-  HDF5_HL_GIF_TOOLS="no"
-fi
-
-
 ## ----------------------------------------------------------------------
 ## Check if they would like to enable building doxygen files
 ##
@@ -4411,7 +4389,6 @@ AM_CONDITIONAL([BUILD_HDF5_HL_CONDITIONAL], [test "X$HDF5_HL" = "Xyes"])
 AM_CONDITIONAL([BUILD_TESTS_CONDITIONAL], [test "X$HDF5_TESTS" = "Xyes"])
 AM_CONDITIONAL([BUILD_TESTS_PARALLEL_CONDITIONAL], [test -n "$TESTPARALLEL"])
 AM_CONDITIONAL([BUILD_TOOLS_CONDITIONAL], [test "X$HDF5_TOOLS" = "Xyes"])
-AM_CONDITIONAL([BUILD_TOOLS_HL_GIF_CONDITIONAL], [test "X$HDF5_HL_GIF_TOOLS" = "Xyes"])
 AM_CONDITIONAL([BUILD_DOXYGEN_CONDITIONAL], [test "X$HDF5_DOXYGEN" = "Xyes"])
 
 ## ----------------------------------------------------------------------
@@ -4619,8 +4596,6 @@ AC_CONFIG_FILES([Makefile
                  hl/test/Makefile
                  hl/test/H5srcdir_str.h
                  hl/tools/Makefile
-                 hl/tools/gif2h5/Makefile
-                 hl/tools/gif2h5/h52giftest.sh
                  hl/tools/h5watch/Makefile
                  hl/tools/h5watch/testh5watch.sh
                  hl/examples/Makefile

hl/tools/CMakeLists.txt

@@ -1,12 +1,4 @@
 cmake_minimum_required (VERSION 3.18)
 project (HDF5_HL_TOOLS C)
 
-#-----------------------------------------------------------------------------
-#-- Option to build the High level GIF Tools
-#-----------------------------------------------------------------------------
-option (HDF5_BUILD_HL_GIF_TOOLS  "Build HDF5 HL GIF Tools" OFF)
-if (HDF5_BUILD_HL_GIF_TOOLS)
-  add_subdirectory (gif2h5)
-endif ()
-
 add_subdirectory (h5watch)

hl/tools/Makefile.am

@@ -18,13 +18,7 @@
 
 include $(top_srcdir)/config/commence.am
 
-if BUILD_TOOLS_HL_GIF_CONDITIONAL
-  TOOLS_GIF_DIR = gif2h5
-else
-  TOOLS_GIF_DIR =
-endif
-
 # All subdirectories
-SUBDIRS=h5watch $(TOOLS_GIF_DIR)
+SUBDIRS=h5watch
 
 include $(top_srcdir)/config/conclude.am