diff --git a/configure b/configure index f5ebdc2365a20992fb7b0d177575d15ac67345f7..12fbbed3fe3ac94a4f71ededcc97e877e194e8c3 100755 --- a/configure +++ b/configure @@ -770,7 +770,7 @@ with_fftw_incdir with_xsl_url enable_model_fitting enable_threads -enable_gprof +enable_profiling enable_best_link ' ac_precious_vars='build_alias @@ -1421,8 +1421,7 @@ Optional Features: --enable-threads[=] Enable multhreading (on with up to 16 threads by default) - --enable-gprof Enable special mode for compilation with the gprof - profiler (off by default) + --enable-profiling Enable special mode for profiling (off by default) --enable-best-link Choose the right combination of static and dynamic linking to make the executable as portable as possible (off by default) @@ -12888,12 +12887,12 @@ fi # Deactivate multithreading for now use_pthreads="no" -# Provide special option for gprof profiling -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gprof profiler mode" >&5 -$as_echo_n "checking for gprof profiler mode... " >&6; } -# Check whether --enable-gprof was given. -if test "${enable_gprof+set}" = set; then : - enableval=$enable_gprof; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +# Provide special option for profiling +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for profiler mode" >&5 +$as_echo_n "checking for profiler mode... " >&6; } +# Check whether --enable-profiling was given. +if test "${enable_profiling+set}" = set; then : + enableval=$enable_profiling; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -15017,8 +15016,8 @@ fi fi fi -# Link with gprof option -if test "$enable_gprof" = "yes"; then +# Compile with profiling option +if test "$enable_profiling" = "yes"; then if test "$enable_icc" = "yes"; then AM_CFLAGS="$AM_CFLAGS -pq" else diff --git a/configure.ac b/configure.ac index c7db71868916f435629416325b07be3a11591bf3..925e6c453b8c1a55330e18695fb24f01b2740bec 100644 --- a/configure.ac +++ b/configure.ac @@ -187,12 +187,11 @@ AC_ARG_ENABLE(threads, # Deactivate multithreading for now use_pthreads="no" -# Provide special option for gprof profiling -AC_MSG_CHECKING([for gprof profiler mode]) -AC_ARG_ENABLE(gprof, - [AS_HELP_STRING([--enable-gprof], - [Enable special mode for compilation with the gprof profiler \ -(off by default)])], +# Provide special option for profiling +AC_MSG_CHECKING([for profiler mode]) +AC_ARG_ENABLE(profiling, + [AS_HELP_STRING([--enable-profiling], + [Enable special mode for profiling (off by default)])], AC_MSG_RESULT([yes]), AC_MSG_RESULT([no])) @@ -256,8 +255,8 @@ if test "$enable_model_fitting" = "yes"; then fi fi -# Link with gprof option -if test "$enable_gprof" = "yes"; then +# Compile with profiling option +if test "$enable_profiling" = "yes"; then if test "$enable_icc" = "yes"; then AM_CFLAGS="$AM_CFLAGS -pq" else diff --git a/sextractor.spec.in b/sextractor.spec.in index bd8db6c33646939bcbe829c0d9e5238fb63d77fe..e9655c79b8ca5ff673ff542f14112235c6866990 100644 --- a/sextractor.spec.in +++ b/sextractor.spec.in @@ -7,7 +7,7 @@ # # This file part of: SExtractor # -# Copyright: (C) 2002-2010 Emmanuel Bertin -- IAP/CNRS/UPMC +# Copyright: (C) 2002-2012 Emmanuel Bertin -- IAP/CNRS/UPMC # # License: GNU General Public License # @@ -22,7 +22,7 @@ # You should have received a copy of the GNU General Public License # along with SExtractor. If not, see . # -# Last modified: 10/10/2010 +# Last modified: 12/07/2012 # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -52,9 +52,9 @@ SExtractor stands for ``Source Extractor'': a software for making catalog of sou %build if test "$USE_BEST"; then -%configure --enable-icc --enable-auto-flags --enable-best-link +%configure --enable-icc --enable-mkl --enable-auto-flags --enable-best-link elif test "$USE_ICC"; then -%configure --enable-icc +%configure --enable-icc --enable-mkl else %configure fi