updating nemesis configuration

colibius · Feb 6, 2013 · a33bd96 · a33bd96
1 parent 60a60e7
commit a33bd96
Show file tree

Hide file tree

Showing 80 changed files with 112 additions and 132 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -3998,7 +3998,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/configure b/configure
@@ -675,9 +675,12 @@ LIBMESH_ENABLE_LIBHILBERT_FALSE
 LIBMESH_ENABLE_LIBHILBERT_TRUE
 LIBHILBERT_LIBRARY
 LIBHILBERT_INCLUDE
+LIBMESH_ENABLE_NEMESIS_V522_FALSE
+LIBMESH_ENABLE_NEMESIS_V522_TRUE
+LIBMESH_ENABLE_NEMESIS_V309_FALSE
+LIBMESH_ENABLE_NEMESIS_V309_TRUE
 LIBMESH_ENABLE_NEMESIS_FALSE
 LIBMESH_ENABLE_NEMESIS_TRUE
-NEMESIS_LIBRARY
 NEMESIS_INCLUDE
 LIBMESH_ENABLE_EXODUS_V522_FALSE
 LIBMESH_ENABLE_EXODUS_V522_TRUE
@@ -31861,52 +31864,75 @@ fi
   # Check whether --enable-nemesis was given.
 if test "${enable_nemesis+set}" = set; then :
   enableval=$enable_nemesis; case "${enableval}" in
-		  yes)  enablenemesis=yes ;;
-		   no)  enablenemesis=no ;;
- 		    *)  as_fn_error $? "bad value ${enableval} for --enable-nemesis" "$LINENO" 5 ;;
+		  yes|v309) enablenemesis=yes ; nemesisversion="v3.09" ;;
+		  new|v522) enablenemesis=yes ; nemesisversion="v5.22" ;;
+		        no) enablenemesis=no  ; nemesisversion=no ;;
+ 		         *) as_fn_error $? "bad value ${enableval} for --enable-nemesis" "$LINENO" 5 ;;
 		 esac
 else
-  enablenemesis=$enableexodus
+  enablenemesis=$enableexodus ; nemesisversion="v3.09"
 fi
  # if unspecified, depend on exodus
 
 
   # Trump --enable-nemesis with --disable-mpi
   if (test "x$enablempi" = xno); then
-    enablenemesis=no
+    nemesisversion=no
   fi
 
-      if (test $enablenemesis = yes); then
-     NEMESIS_INCLUDE="-I\$(top_srcdir)/contrib/nemesis/Lib"
-     NEMESIS_LIBRARY="\$(EXTERNAL_LIBDIR)/libnemesis\$(libext)"
+  case "${nemesisversion}" in
+
+      "v3.09")
+	  # The NEMESIS API is distributed with libmesh, so we don't have to guess
+	  # where it might be installed...
+	  NEMESIS_INCLUDE="-I\$(top_srcdir)/contrib/nemesis/$nemesisversion"
 
 $as_echo "#define HAVE_NEMESIS_API 1" >>confdefs.h
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with Nemesis support >>>" >&5
-$as_echo "<<< Configuring library with Nemesis support >>>" >&6; }
-     have_nemesis=yes
-  else
-     NEMESIS_INCLUDE=""
-     NEMESIS_LIBRARY=""
-     enablenemesis=no
-     have_nemesis=no
-  fi
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with Nemesis version $nemesisversion support >>>" >&5
+$as_echo "<<< Configuring library with Nemesis version $nemesisversion support >>>" >&6; }
+	  ;;
+
+      "v5.22")
+	  exit 1
+	  ;;
+
+      *)
+	  NEMESIS_INCLUDE=""
+	  enablenemesis=no
+	  ;;
+  esac
 
+  ac_config_files="$ac_config_files contrib/nemesis/v3.09/Makefile"
 
 
 
       if (test $enablenemesis = yes); then
          libmesh_contrib_INCLUDES="$NEMESIS_INCLUDE $libmesh_contrib_INCLUDES"
       fi
-       if test x$enablenemesis = xyes; then
+       if test x$enablenemesis  = xyes; then
   LIBMESH_ENABLE_NEMESIS_TRUE=
   LIBMESH_ENABLE_NEMESIS_FALSE='#'
 else
   LIBMESH_ENABLE_NEMESIS_TRUE='#'
   LIBMESH_ENABLE_NEMESIS_FALSE=
 fi
 
-      ac_config_files="$ac_config_files contrib/nemesis/Lib/Makefile"
+       if test x$nemesisversion = xv3.09; then
+  LIBMESH_ENABLE_NEMESIS_V309_TRUE=
+  LIBMESH_ENABLE_NEMESIS_V309_FALSE='#'
+else
+  LIBMESH_ENABLE_NEMESIS_V309_TRUE='#'
+  LIBMESH_ENABLE_NEMESIS_V309_FALSE=
+fi
+
+       if test x$nemesisversion = xv5.22; then
+  LIBMESH_ENABLE_NEMESIS_V522_TRUE=
+  LIBMESH_ENABLE_NEMESIS_V522_FALSE='#'
+else
+  LIBMESH_ENABLE_NEMESIS_V522_TRUE='#'
+  LIBMESH_ENABLE_NEMESIS_V522_FALSE=
+fi
 
       # -------------------------------------------------------------
    # -------------------------------------------------------------
@@ -32895,6 +32921,14 @@ if test -z "${LIBMESH_ENABLE_NEMESIS_TRUE}" && test -z "${LIBMESH_ENABLE_NEMESIS
   as_fn_error $? "conditional \"LIBMESH_ENABLE_NEMESIS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${LIBMESH_ENABLE_NEMESIS_V309_TRUE}" && test -z "${LIBMESH_ENABLE_NEMESIS_V309_FALSE}"; then
+  as_fn_error $? "conditional \"LIBMESH_ENABLE_NEMESIS_V309\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${LIBMESH_ENABLE_NEMESIS_V522_TRUE}" && test -z "${LIBMESH_ENABLE_NEMESIS_V522_FALSE}"; then
+  as_fn_error $? "conditional \"LIBMESH_ENABLE_NEMESIS_V522\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${LIBMESH_ENABLE_LIBHILBERT_TRUE}" && test -z "${LIBMESH_ENABLE_LIBHILBERT_FALSE}"; then
   as_fn_error $? "conditional \"LIBMESH_ENABLE_LIBHILBERT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -34107,7 +34141,7 @@ do
     "contrib/netcdf/v3/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/netcdf/v3/Makefile" ;;
     "contrib/exodusii/v5.09/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/exodusii/v5.09/Makefile" ;;
     "contrib/exodusii/v5.22/exodus/cbind/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/exodusii/v5.22/exodus/cbind/Makefile" ;;
-    "contrib/nemesis/Lib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/nemesis/Lib/Makefile" ;;
+    "contrib/nemesis/v3.09/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/nemesis/v3.09/Makefile" ;;
     "contrib/libHilbert/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/libHilbert/Makefile" ;;
     "contrib/fparser/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/fparser/Makefile" ;;
     "contrib/fparser/extrasrc/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/fparser/extrasrc/Makefile" ;;
@@ -36349,6 +36383,9 @@ if (test "x$enableoptional" = "xyes"); then
   echo '  'mpi.............................. : $enablempi
   echo '  'nanoflann........................ : $enablenanoflann
   echo '  'nemesis.......................... : $enablenemesis
+  if (test "x$nemesisversion" != "xno"); then
+  echo '     'version....................... : $nemesisversion
+  fi
   echo '  'netcdf........................... : $enablenetcdf
   if (test "x$netcdfversion" != "xno"); then
   echo '     'version....................... : $netcdfversion

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
@@ -75,15 +75,19 @@ if LIBMESH_ENABLE_EXODUS_V522
 endif
 endif
 
+
 if LIBMESH_ENABLE_NEMESIS
-  SUBDIRS    += nemesis/Lib
-  opt_libs   += nemesis/Lib/libopt.la 
-  dbg_libs   += nemesis/Lib/libdbg.la 
-  devel_libs += nemesis/Lib/libdevel.la 
-  prof_libs  += nemesis/Lib/libprof.la 
-  oprof_libs += nemesis/Lib/liboprof.la 
+if LIBMESH_ENABLE_NEMESIS_V309
+  SUBDIRS    += nemesis/v3.09
+  opt_libs   += nemesis/v3.09/libopt.la 
+  dbg_libs   += nemesis/v3.09/libdbg.la 
+  devel_libs += nemesis/v3.09/libdevel.la 
+  prof_libs  += nemesis/v3.09/libprof.la 
+  oprof_libs += nemesis/v3.09/liboprof.la 
+endif
 endif
 
+
 if LIBMESH_ENABLE_TECIO
   SUBDIRS    += tecplot/tecio
   opt_libs   += tecplot/tecio/libopt.la

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
@@ -92,12 +92,12 @@ target_triplet = @target@
 @LIBMESH_ENABLE_EXODUS_TRUE@@LIBMESH_ENABLE_EXODUS_V522_TRUE@am__append_35 = exodusii/v5.22/exodus/cbind/libdevel.la
 @LIBMESH_ENABLE_EXODUS_TRUE@@LIBMESH_ENABLE_EXODUS_V522_TRUE@am__append_36 = exodusii/v5.22/exodus/cbind/libprof.la
 @LIBMESH_ENABLE_EXODUS_TRUE@@LIBMESH_ENABLE_EXODUS_V522_TRUE@am__append_37 = exodusii/v5.22/exodus/cbind/liboprof.la
-@LIBMESH_ENABLE_NEMESIS_TRUE@am__append_38 = nemesis/Lib
-@LIBMESH_ENABLE_NEMESIS_TRUE@am__append_39 = nemesis/Lib/libopt.la 
-@LIBMESH_ENABLE_NEMESIS_TRUE@am__append_40 = nemesis/Lib/libdbg.la 
-@LIBMESH_ENABLE_NEMESIS_TRUE@am__append_41 = nemesis/Lib/libdevel.la 
-@LIBMESH_ENABLE_NEMESIS_TRUE@am__append_42 = nemesis/Lib/libprof.la 
-@LIBMESH_ENABLE_NEMESIS_TRUE@am__append_43 = nemesis/Lib/liboprof.la 
+@LIBMESH_ENABLE_NEMESIS_TRUE@@LIBMESH_ENABLE_NEMESIS_V309_TRUE@am__append_38 = nemesis/v3.09
+@LIBMESH_ENABLE_NEMESIS_TRUE@@LIBMESH_ENABLE_NEMESIS_V309_TRUE@am__append_39 = nemesis/v3.09/libopt.la 
+@LIBMESH_ENABLE_NEMESIS_TRUE@@LIBMESH_ENABLE_NEMESIS_V309_TRUE@am__append_40 = nemesis/v3.09/libdbg.la 
+@LIBMESH_ENABLE_NEMESIS_TRUE@@LIBMESH_ENABLE_NEMESIS_V309_TRUE@am__append_41 = nemesis/v3.09/libdevel.la 
+@LIBMESH_ENABLE_NEMESIS_TRUE@@LIBMESH_ENABLE_NEMESIS_V309_TRUE@am__append_42 = nemesis/v3.09/libprof.la 
+@LIBMESH_ENABLE_NEMESIS_TRUE@@LIBMESH_ENABLE_NEMESIS_V309_TRUE@am__append_43 = nemesis/v3.09/liboprof.la 
 @LIBMESH_ENABLE_TECIO_TRUE@am__append_44 = tecplot/tecio
 @LIBMESH_ENABLE_TECIO_TRUE@am__append_45 = tecplot/tecio/libopt.la
 @LIBMESH_ENABLE_TECIO_TRUE@am__append_46 = tecplot/tecio/libdbg.la
@@ -363,7 +363,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = boost/include gmv gzstream netcdf/v3 netcdf/v4 \
-	exodusii/v5.09 exodusii/v5.22/exodus/cbind nemesis/Lib \
+	exodusii/v5.09 exodusii/v5.22/exodus/cbind nemesis/v3.09 \
 	tecplot/tecio triangle tetgen libHilbert laspack metis \
 	parmetis sfcurves fparser nanoflann
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -517,7 +517,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/boost/include/Makefile.in b/contrib/boost/include/Makefile.in
@@ -529,7 +529,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/exodusii/5.22b/exodus/cbind/Makefile.in b/contrib/exodusii/5.22b/exodus/cbind/Makefile.in
@@ -1891,7 +1891,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/exodusii/Lib/Makefile.in b/contrib/exodusii/Lib/Makefile.in
@@ -1016,7 +1016,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/fparser/Makefile.in b/contrib/fparser/Makefile.in
@@ -466,7 +466,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/fparser/extrasrc/Makefile.in b/contrib/fparser/extrasrc/Makefile.in
@@ -243,7 +243,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/gmv/Makefile.in b/contrib/gmv/Makefile.in
@@ -325,7 +325,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/gzstream/Makefile.in b/contrib/gzstream/Makefile.in
@@ -347,7 +347,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/laspack/Makefile.in b/contrib/laspack/Makefile.in
@@ -385,7 +385,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/libHilbert/Makefile.in b/contrib/libHilbert/Makefile.in
@@ -388,7 +388,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/metis/Makefile.in b/contrib/metis/Makefile.in
@@ -586,7 +586,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/nanoflann/Makefile.in b/contrib/nanoflann/Makefile.in
@@ -355,7 +355,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/nemesis/Lib/Makefile.in b/contrib/nemesis/Lib/Makefile.in
@@ -59,7 +59,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 @LIBMESH_OPT_MODE_TRUE@am__append_3 = libopt.la
 @LIBMESH_PROF_MODE_TRUE@am__append_4 = libprof.la
 @LIBMESH_OPROF_MODE_TRUE@am__append_5 = liboprof.la
-subdir = contrib/nemesis/Lib
+subdir = contrib/nemesis/v3.09
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_cxx_rtti.m4 \
 	$(top_srcdir)/m4/ax_boost_base.m4 \
@@ -485,7 +485,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -742,9 +741,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/nemesis/Lib/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/nemesis/v3.09/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu contrib/nemesis/Lib/Makefile
+	  $(AUTOMAKE) --gnu contrib/nemesis/v3.09/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

diff --git a/contrib/nemesis/v3.09 b/contrib/nemesis/v3.09
@@ -0,0 +1 @@
+Lib
diff --git a/contrib/nemesis/v5.22 b/contrib/nemesis/v5.22
@@ -0,0 +1 @@
+../exodusii/5.22b
diff --git a/contrib/netcdf/Lib/Makefile.in b/contrib/netcdf/Lib/Makefile.in
@@ -388,7 +388,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/parmetis/Makefile.in b/contrib/parmetis/Makefile.in
@@ -476,7 +476,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/sfcurves/Makefile.in b/contrib/sfcurves/Makefile.in
@@ -335,7 +335,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/tecplot/tecio/Makefile.in b/contrib/tecplot/tecio/Makefile.in
@@ -469,7 +469,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/tetgen/Makefile.in b/contrib/tetgen/Makefile.in
@@ -355,7 +355,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/contrib/triangle/Makefile.in b/contrib/triangle/Makefile.in
@@ -355,7 +355,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/examples/Makefile.in b/examples/Makefile.in
@@ -308,7 +308,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@

diff --git a/examples/adaptivity/adaptivity_ex1/Makefile.in b/examples/adaptivity/adaptivity_ex1/Makefile.in
@@ -390,7 +390,6 @@ MPI_LIBS_PATH = @MPI_LIBS_PATH@
 MPI_LIBS_PATHS = @MPI_LIBS_PATHS@
 NANOFLANN_INCLUDE = @NANOFLANN_INCLUDE@
 NEMESIS_INCLUDE = @NEMESIS_INCLUDE@
-NEMESIS_LIBRARY = @NEMESIS_LIBRARY@
 NETCDF_INCLUDE = @NETCDF_INCLUDE@
 NM = @NM@
 NMEDIT = @NMEDIT@