Replaced --enable-gprof configuration with --enable-profiling. (e17e5974) · Commits · csst-pipeline / msc / sextractor

configure

+10 −11

Original line number	Diff line number	Diff line
		@@ -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[=<max_number_of_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

configure.ac

+7 −8

Original line number	Diff line number	Diff line
		@@ -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

sextractor.spec.in

+4 −4

Original line number	Diff line number	Diff line
		@@ -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 <http://www.gnu.org/licenses/>.
		#
		# 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