Remove the dependency on CPAN module List::MoreUtils (#337)

* Remove List::MoreUtils as a dependency

* Minor updates to split_ncvars.pl

* Use the POSIX shell version of list_ncvars in split_ncvars

Author: underwoo

configure.ac

@@ -163,10 +163,6 @@ AS_IF([test -z "$NCKS"],
 
 AC_ARG_VAR([PERL], [Path to perl])
 AC_PATH_PROG(PERL, [perl])
-AX_PROG_PERL_MODULES([List::MoreUtils], dnl
-  eval AS_TR_CPP(HAVE_PLMOD_LIST_MOREUTILS)=yes,
-  AC_MSG_WARN([Perl module List::MoreUtils not found.  Some applications will not be installed.]))
-AM_CONDITIONAL([HAVE_PLMOD_LIST_MOREUTILS], [test x$HAVE_PLMOD_LIST_MOREUTILS = xyes])
 
 AX_PYTHON_MODULE([xarray],[],[python3])
 if test ${HAVE_PYMOD_XARRAY} = yes; then

m4/ax_prog_perl_modules.m4

@@ -16,13 +16,10 @@ bin_SCRIPTS = \
   list_ncvars.csh \
   list_ncvars.sh \
   plevel.sh \
+  split_ncvars.pl \
   timavg \
   timavg.csh
 
-if HAVE_PLMOD_LIST_MOREUTILS
-  bin_SCRIPTS += split_ncvars.pl
-endif
-
 pkglibexec_PROGRAMS = \
   list_ncvars \
   print_version \
@@ -212,3 +209,8 @@ timavg.csh: timeavg/timavg.csh.in Makefile
 split_ncvars.pl: split_ncvars/split_ncvars.pl.in Makefile
 	$(do_subst) < $(srcdir)/split_ncvars/split_ncvars.pl.in > split_ncvars.pl
 	chmod +x split_ncvars.pl
+
+install-exec-hook:
+	ln $(DESTDIR)$(bindir)/split_ncvars.pl $(DESTDIR)$(bindir)/split_ncvars
+install-data-hook:
+	ln $(DESTDIR)$(mandir)/man1/split_ncvars.pl.1 $(DESTDIR)$(mandir)/man1/split_ncvars.1

src/Makefile.am

@@ -28,7 +28,6 @@
 use strict;
 use Cwd;
 use Getopt::Long;
-use List::MoreUtils qw{uniq};
 Getopt::Long::Configure("bundling");
 use File::Path;
 use File::Spec;
@@ -126,7 +125,7 @@ my $ncatted
 my $list_ncvars
     = defined( $ENV{LIST_NCVARS} )
     ? $ENV{LIST_NCVARS}
-    : "$/list_ncvars.csh";
+    : "$prefix/list_ncvars.sh";
 
 my $ncdump
     = defined( $ENV{NCDUMP} )
@@ -578,6 +577,7 @@ sub get_variable_dimensions {
     my $var  = shift;
     my %cartesian_coords;
     my @coords;
+    my %var_dims;
 
     # Get a list of the cartesian coordinates that are in a file
     while ( $dump =~ /\t\t(.*):(cartesian_axis|axis) = "(.*)"/g ) {
@@ -586,7 +586,8 @@ sub get_variable_dimensions {
 
     # Compare the cartesian coords to those of the variables
     if ( $dump =~ /\t.*$var\((.+)\)/ ) {
-        @coords = uniq map { grep $_, split /,\s/, $1 } keys %cartesian_coords;
+        @var_dims{ split /,\s/, $1 } = ();
+        @coords = grep { exists $cartesian_coords{$_} } keys %var_dims;
     }
     return \@coords;
 }

src/split_ncvars/split_ncvars.pl.in

@@ -24,12 +24,6 @@ else
 skipflag=""
 endif
 
-if HAVE_PLMOD_LIST_MOREUTILS
-have_plmod_list_moreutils="yes"
-else
-have_plmod_list_moreutils="no"
-endif
-
 AM_CFLAGS = $(NETCDF_CFLAGS) -I$(top_builddir)/src -I$(top_srcdir)/tools/libfrencutils
 AM_FCFLAGS = -I$(top_builddir)/src
 LDADD = -L$(top_builddir)/src -lver $(NETCDF_LDFLAGS) $(NETCDF_LIBS)
@@ -60,7 +54,7 @@ TESTS_ENVIRONMENT = \
     builddir=$(abs_builddir); export builddir; \
     MPIRUN=$(MPIRUN); export MPIRUN; \
     skipflag=$(skipflag); export skipflag; \
-    have_plmod_list_moreutils=$(have_plmod_list_moreutils); export have_plmod_list_moreutils; \
+    PREFIX=$(abs_top_builddir)/src; export PREFIX; \
     PKGLIBEXECDIR="$(abs_top_builddir)/src"; export PKGLIBEXECDIR; \
     for d in $$( find $(abs_top_builddir)/tools -mindepth 1 -not -path '*/\.*' -type d ); do \
       PATH="$$d"'$(PATH_SEPARATOR)'"$$PATH"; \

tests/Makefile.am

@@ -26,8 +26,6 @@ fi
 
 . ${srcdir=.}/init.sh; path_prepend_ ../src
 
-test $have_plmod_list_moreutils = no && skip_ "perl module List::MoreUtils not available"
-
 # Use the test netCDF files from plevel and timeavg
 ${builddir=.}/create_timeavg_test_ncfiles || framework_failure_ "failed to create timeavg test files"
 ${builddir=.}/create_plevel_test_ncfile || framework_failure_ "failed to create plevel test files"

tests/split_ncvars/split_ncvars

@@ -26,8 +26,6 @@ fi
 
 . ${srcdir=.}/init.sh; path_prepend_ ../src
 
-test $have_plmod_list_moreutils = no && skip_ "perl module List::MoreUtils not available"
-
 # Use the test netCDF files from plevel
 ${builddir=.}/create_plevel_test_ncfile || framework_failure_ "failed to create plevel test files"
 mkdir idir || framework_failure_ "failed to create idir"

tests/split_ncvars/split_ncvars-i

@@ -26,8 +26,6 @@ fi
 
 . ${srcdir=.}/init.sh; path_prepend_ ../src
 
-test $have_plmod_list_moreutils = no && skip_ "perl module List::MoreUtils not available"
-
 # Use the test netCDF files from timeavg
 ${builddir=.}/create_timeavg_test_ncfiles || framework_failure_ "failed to create test files"
 

tests/split_ncvars/split_ncvars-l

@@ -26,8 +26,6 @@ fi
 
 . ${srcdir=.}/init.sh; path_prepend_ ../src
 
-test $have_plmod_list_moreutils = no && skip_ "perl module List::MoreUtils not available"
-
 # Use the test netCDF files from plevel
 ${builddir=.}/create_plevel_test_ncfile || framework_failure_ "failed to create plevel test files"
 

tests/split_ncvars/split_ncvars-o

@@ -26,8 +26,6 @@ fi
 
 . ${srcdir=.}/init.sh; path_prepend_ ../src
 
-test $have_plmod_list_moreutils = no && skip_ "perl module List::MoreUtils not available"
-
 # Use the test netCDF files from plevel
 ${builddir=.}/create_plevel_test_ncfile || framework_failure_ "failed to create test files"