Merge commit 'e275c19aed73082132780d3e34308e322e17b18e' into Ver.2.0_…

…w_PVR

configure

@@ -1460,8 +1460,10 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-fftw3            Use fftw3 library
+  --with-fftw3           Use fftw3 library
+   --without-fftw3 to disable fftw3 library
   --with-libpng           Use libpng library
+   --without-libpng to disable libpng library
   --with-hdf5=yes/no/PATH full path of h5pcc for parallel HDF5 configuration
   --with-blas=<lib>       use BLAS library <lib>
   --with-zlib=DIR root directory path of zlib installation defaults to
@@ -4053,17 +4055,26 @@ fi
 # Check whether --with-fftw3 was given.
 if test ${with_fftw3+y}
 then :
-  withval=$with_fftw3; USE_fftw3='yes'
+  withval=$with_fftw3; if test "$withval" != no ; then
+  USE_fftw3='yes'
+ else
+  USE_fftw3='no'
+ fi
 else case e in #(
   e) USE_fftw3='no' ;;
 esac
 fi
 
 
+
 # Check whether --with-libpng was given.
 if test ${with_libpng+y}
 then :
-  withval=$with_libpng; USE_libpng='yes'
+  withval=$with_libpng; if test "$withval" != no ; then
+  USE_libpng='yes'
+ else
+  USE_libpng='no'
+ fi
 else case e in #(
   e) USE_libpng='no' ;;
 esac

configure.ac

@@ -38,9 +38,24 @@ AC_CONFIG_SRCDIR([src/programs/SPH_MHD/main_sph_MHD_w_psf.f90])
 # AC_CONFIG_HEADER([config.h])
 
 AC_ARG_WITH(fftw3,
-	[  --with-fftw3            Use fftw3 library],[USE_fftw3='yes'],[USE_fftw3='no'])
+[  --with-fftw3           Use fftw3 library
+   --without-fftw3 to disable fftw3 library],
+[if test "$withval" != no ; then
+  USE_fftw3='yes'
+ else
+  USE_fftw3='no'
+ fi],
+[USE_fftw3='no'])
+
 AC_ARG_WITH(libpng,
-	[  --with-libpng           Use libpng library],[USE_libpng='yes'],[USE_libpng='no'])
+[  --with-libpng           Use libpng library
+   --without-libpng to disable libpng library],
+[if test "$withval" != no ; then
+  USE_libpng='yes'
+ else
+  USE_libpng='no'
+ fi],
+[USE_libpng='no'])
 
 AC_MSG_RESULT(with-fftw3...   "${USE_fftw3}")
 AC_MSG_RESULT(enable-libpng..."${USE_libpng}")

src/option_settings

@@ -10,8 +10,7 @@ CC=icc FC=ifort F77=ifort CXX=icc AR=xiar MPICC=mpicc MPIFC=mpif90 \
 PKG_CONFIG=/usr/bin/pkg-config CFLAGS='-Os -Wall -g -xCORE-AVX2 -axMIC-AVX512' \
 FCFLAGS='-Os -xCORE-AVX2 -axMIC-AVX512 -warn all -g -nogen-interfaces'  \
 FFTW3_CFLAGS='$$(TACC_FFTW3_INC)' FFTW3_LIBS='-L$$(TACC_FFTW3_LIB) -lfftw3' \
---with-blas=-mkl=sequential --enable-fftw3 --enable-libpng --with-hdf5 \
---with-zlib=/usr/lib64 --without-pgplot --without-aquaterm \
+--with-blas=-mkl=sequential --enable-fftw3 --enable-libpng --with-hdf5 --with-zlib=/usr/lib64 \
 PKG_CONFIG_PATH='/usr/lib64/pkgconfig:/home/hmatsui/local/lib/pkgconfig'