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

Fixed activation of the model-fitting module.

parent 5820bb12

configure.ac

+45 −42
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#	You should have received a copy of the GNU General Public License

#	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.

#

#	Last modified:		19/06/2017

#	Last modified:		20/06/2017

#

#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -238,6 +238,9 @@ if test "$use_pthreads" = "yes"; then 
fi

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) ###########

  if test "$enable_mkl" = "yes"; then

    convlibs="${srcdir}/wcs/libwcs_c.a,${srcdir}/levmar/liblevmar.a"
@@ -276,7 +279,6 @@ else 
        ],

        AC_MSG_ERROR([$OPENBLAS_ERROR Exiting.])

      )



    else

######### handle the ATLAS library (linear algebra: BLAS + cLAPACK) ##########

      ACX_ATLAS($with_atlas_libdir, $with_atlas_incdir, $use_pthreads,
@@ -290,6 +292,7 @@ else 
      )

    fi

  fi

fi



AM_CONDITIONAL(USE_MODEL, [test "$enable_model_fitting" != "no"])

doc/src/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ language = None 
# There are two options for replacing |today|: either, you set today to some

# 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.

#