Commit 6dc16349 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed activation of the model-fitting module.

parent 5820bb12
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with SExtractor. If not, see <http://www.gnu.org/licenses/>. # along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
# #
# Last modified: 19/06/2017 # Last modified: 20/06/2017
# #
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
...@@ -238,8 +238,11 @@ if test "$use_pthreads" = "yes"; then ...@@ -238,8 +238,11 @@ if test "$use_pthreads" = "yes"; then
fi fi
AM_CONDITIONAL(USE_THREADS, test $use_pthreads = "yes") AM_CONDITIONAL(USE_THREADS, test $use_pthreads = "yes")
############# Actions to complete if model-fitting is activated ##############
if test "$enable_model_fitting" != "no"; then
AC_DEFINE(USE_MODEL, 1, [Triggers model-fitting])
############ handle the INTEL MKL library (FFTW + LAPACKe) ########### ############ handle the INTEL MKL library (FFTW + LAPACKe) ###########
if test "$enable_mkl" = "yes"; then if test "$enable_mkl" = "yes"; then
convlibs="${srcdir}/wcs/libwcs_c.a,${srcdir}/levmar/liblevmar.a" convlibs="${srcdir}/wcs/libwcs_c.a,${srcdir}/levmar/liblevmar.a"
ACX_MKL($with_mkl_dir,yes,$enable_best_link,$convlibs) ACX_MKL($with_mkl_dir,yes,$enable_best_link,$convlibs)
if test "$MKL_WARN" == ""; then if test "$MKL_WARN" == ""; then
...@@ -251,7 +254,7 @@ if test "$enable_mkl" = "yes"; then ...@@ -251,7 +254,7 @@ if test "$enable_mkl" = "yes"; then
AM_CFLAGS="$AM_CFLAGS $MKL_CFLAGS " AM_CFLAGS="$AM_CFLAGS $MKL_CFLAGS "
AM_LDFLAGS="$AM_LDFLAGS $MKL_LDFLAGS " AM_LDFLAGS="$AM_LDFLAGS $MKL_LDFLAGS "
LIBS="$LIBS $MKL_LIBS" LIBS="$LIBS $MKL_LIBS"
else else
################ handle the FFTW library (Fourier transforms) ################ ################ handle the FFTW library (Fourier transforms) ################
ACX_FFTW($with_fftw_libdir, $with_fftw_incdir, $use_pthreads,yes, ACX_FFTW($with_fftw_libdir, $with_fftw_incdir, $use_pthreads,yes,
[ [
...@@ -276,7 +279,6 @@ else ...@@ -276,7 +279,6 @@ else
], ],
AC_MSG_ERROR([$OPENBLAS_ERROR Exiting.]) AC_MSG_ERROR([$OPENBLAS_ERROR Exiting.])
) )
else else
######### handle the ATLAS library (linear algebra: BLAS + cLAPACK) ########## ######### handle the ATLAS library (linear algebra: BLAS + cLAPACK) ##########
ACX_ATLAS($with_atlas_libdir, $with_atlas_incdir, $use_pthreads, ACX_ATLAS($with_atlas_libdir, $with_atlas_incdir, $use_pthreads,
...@@ -289,6 +291,7 @@ else ...@@ -289,6 +291,7 @@ else
AC_MSG_ERROR([$ATLAS_ERROR Exiting.]) AC_MSG_ERROR([$ATLAS_ERROR Exiting.])
) )
fi fi
fi
fi fi
AM_CONDITIONAL(USE_MODEL, [test "$enable_model_fitting" != "no"]) AM_CONDITIONAL(USE_MODEL, [test "$enable_model_fitting" != "no"])
......
...@@ -81,7 +81,7 @@ language = None ...@@ -81,7 +81,7 @@ language = None
# There are two options for replacing |today|: either, you set today to some # There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used: # non-false value, then it is used:
# #
today = 'Mon Jun 19 2017' today = 'Tue Jun 20 2017'
# #
# Else, today_fmt is used as the format for a strftime call. # Else, today_fmt is used as the format for a strftime call.
# #
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment