Merge branch 'refs/heads/Ver.2.0_w_PVR' into Ver.2.0_alpha

.licensing.json

@@ -9,7 +9,6 @@
     "examples/**",
     "doxygen/**",
     "**/*m4",
-    "**/CMakeLists.txt",
     "config.guess",
     "config.sub",
     "configure",

Makefile.in

@@ -58,6 +58,8 @@ BLAS_LIBS = @BLAS_LIBS@
 #
 ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS =   @ZLIB_LIBS@
+PNG_CFLAGS =  @PNG_CFLAGS@
+PNG_LIBS =    @PNG_LIBS@
 #
 #    FFTW3 settings
 #
@@ -101,6 +103,8 @@ depends: $(MAKE_MOD_DEP)
 		BLAS_LIBS="$(BLAS_LIBS)" \
 		ZLIB_CFLAGS="$(ZLIB_CFLAGS)"   \
 		ZLIB_LIBS="$(ZLIB_LIBS)"       \
+		PNG_CFLAGS="$(PNG_CFLAGS)"   \
+		PNG_LIBS="$(PNG_LIBS)"       \
 		FFTW3_CFLAGS="$(FFTW3_CFLAGS)" \
 		FFTW3_LIBS="$(FFTW3_LIBS)" \
 		HDF5_FFLAGS="$(HDF5_FFLAGS)" \
@@ -138,6 +142,8 @@ makemake: $(MAKE_MOD_DEP)
 		BLAS_LIBS="$(BLAS_LIBS)" \
 		ZLIB_CFLAGS="$(ZLIB_CFLAGS)"   \
 		ZLIB_LIBS="$(ZLIB_LIBS)"       \
+		PNG_CFLAGS="$(PNG_CFLAGS)"   \
+		PNG_LIBS="$(PNG_LIBS)"       \
 		FFTW3_CFLAGS="$(FFTW3_CFLAGS)" \
 		FFTW3_LIBS="$(FFTW3_LIBS)" \
 		HDF5_FFLAGS="$(HDF5_FFLAGS)" \

configure

@@ -4070,6 +4070,15 @@ esac
 fi
 
 
+# Check whether --with-libpng was given.
+if test ${with_libpng+y}
+then :
+  withval=$with_libpng; USE_libpng='yes'
+else $as_nop
+  USE_libpng='no'
+fi
+
+
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: with-fftw3...   \"${USE_fftw3}\"" >&5
 printf "%s\n" "with-fftw3...   \"${USE_fftw3}\"" >&6; }
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: enable-libpng...\"${USE_libpng}\"" >&5

doc/CALYPSO.tex

@@ -47,6 +47,7 @@ \section*{Preface}
 %
 \newpage
 \input{tex_src/programs_CALYPSO.tex}
+\input{tex_src/viz_CALYPSO.tex}
 
 \newpage
 \begin{thebibliography}{10}