Commit 94c50441 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed regression with --disable-model-fitting option. 

Fixed issue with model fitting measurement leftovers with masked sources (thank
s to E. Rykoff).
Pushed version number to 2.19.3.
parent 22c7e544

Makefile.in

+72 −68
Original line number Diff line number Diff line 
# Makefile.in generated by automake 1.11.6 from Makefile.am.

# Makefile.in generated by automake 1.12.2 from Makefile.am.

# @configure_input@



# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software

# Foundation, Inc.

# Copyright (C) 1994-2012 Free Software Foundation, Inc.



# This Makefile.in is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

# with or without modifications, as long as this notice is preserved.
@@ -83,10 +82,15 @@ subdir = . 
DIST_COMMON = README $(am__configure_deps) $(dist_pkgdata_DATA) \

	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \

	$(srcdir)/config.h.in $(srcdir)/sextractor.spec.in \

	$(top_srcdir)/configure AUTHORS ChangeLog INSTALL THANKS \

	autoconf/config.guess autoconf/config.sub autoconf/depcomp \

	autoconf/install-sh autoconf/ltmain.sh autoconf/missing \

	autoconf/mkinstalldirs

	$(top_srcdir)/autoconf/config.guess \

	$(top_srcdir)/autoconf/config.sub \

	$(top_srcdir)/autoconf/install-sh \

	$(top_srcdir)/autoconf/ltmain.sh \

	$(top_srcdir)/autoconf/missing \

	$(top_srcdir)/autoconf/mkinstalldirs $(top_srcdir)/configure \

	AUTHORS ChangeLog INSTALL THANKS autoconf/config.guess \

	autoconf/config.sub autoconf/depcomp autoconf/install-sh \

	autoconf/ltmain.sh autoconf/missing autoconf/mkinstalldirs

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

am__aclocal_m4_deps = $(top_srcdir)/acx_atlas.m4 \

	$(top_srcdir)/acx_fftw.m4 $(top_srcdir)/acx_mkl.m4 \
@@ -151,9 +155,10 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ 
  distclean-recursive maintainer-clean-recursive

AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

	distdir dist dist-all distcheck

	cscope distdir dist dist-all distcheck

ETAGS = etags

CTAGS = ctags

CSCOPE = cscope

DIST_SUBDIRS = $(SUBDIRS)

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

distdir = $(PACKAGE)-$(VERSION)
@@ -164,6 +169,7 @@ am__remove_distdir = \ 
      && rm -rf "$(distdir)" \

      || { sleep 5 && rm -rf "$(distdir)"; }; \

  else :; fi

am__post_remove_distdir = $(am__remove_distdir)

am__relativize = \

  dir0=`pwd`; \

  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -191,6 +197,7 @@ am__relativize = \ 
  reldir="$$dir2"

DIST_ARCHIVES = $(distdir).tar.gz

GZIP_ENV = --best

DIST_TARGETS = dist-gzip

distuninstallcheck_listfiles = find . -type f -print

am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \

  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -426,12 +433,12 @@ uninstall-dist_pkgdataDATA: 
	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)



# This directory's subdirectories are mostly independent; you can cd

# into them and run `make' without going through this Makefile.

# To change the values of `make' variables: instead of editing Makefiles,

# (1) if the variable is set in `config.status', edit `config.status'

#     (which will cause the Makefiles to be regenerated when you run `make');

# (2) otherwise, pass the desired values on the `make' command line.

$(RECURSIVE_TARGETS):

# into them and run 'make' without going through this Makefile.

# To change the values of 'make' variables: instead of editing Makefiles,

# (1) if the variable is set in 'config.status', edit 'config.status'

#     (which will cause the Makefiles to be regenerated when you run 'make');

# (2) otherwise, pass the desired values on the 'make' command line.

$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):

	@fail= failcom='exit 1'; \

	for f in x $$MAKEFLAGS; do \

	  case $$f in \
@@ -441,7 +448,11 @@ $(RECURSIVE_TARGETS): 
	done; \

	dot_seen=no; \

	target=`echo $@ | sed s/-recursive//`; \

	list='$(SUBDIRS)'; for subdir in $$list; do \

	case "$@" in \

	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \

	  *) list='$(SUBDIRS)' ;; \

	esac; \

	for subdir in $$list; do \

	  echo "Making $$target in $$subdir"; \

	  if test "$$subdir" = "."; then \

	    dot_seen=yes; \
@@ -455,37 +466,6 @@ $(RECURSIVE_TARGETS): 
	if test "$$dot_seen" = "no"; then \

	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \

	fi; test -z "$$fail"



$(RECURSIVE_CLEAN_TARGETS):

	@fail= failcom='exit 1'; \

	for f in x $$MAKEFLAGS; do \

	  case $$f in \

	    *=* | --[!k]*);; \

	    *k*) failcom='fail=yes';; \

	  esac; \

	done; \

	dot_seen=no; \

	case "$@" in \

	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \

	  *) list='$(SUBDIRS)' ;; \

	esac; \

	rev=''; for subdir in $$list; do \

	  if test "$$subdir" = "."; then :; else \

	    rev="$$subdir $$rev"; \

	  fi; \

	done; \

	rev="$$rev ."; \

	target=`echo $@ | sed s/-recursive//`; \

	for subdir in $$rev; do \

	  echo "Making $$target in $$subdir"; \

	  if test "$$subdir" = "."; then \

	    local_target="$$target-am"; \

	  else \

	    local_target="$$target"; \

	  fi; \

	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

	  || eval $$failcom; \

	done && test -z "$$fail"

tags-recursive:

	list='$(SUBDIRS)'; for subdir in $$list; do \

	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
@@ -494,6 +474,10 @@ ctags-recursive: 
	list='$(SUBDIRS)'; for subdir in $$list; do \

	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

	done

cscopelist-recursive:

	list='$(SUBDIRS)'; for subdir in $$list; do \

	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \

	done



ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -557,8 +541,32 @@ GTAGS: 
	  && $(am__cd) $(top_srcdir) \

	  && gtags -i $(GTAGS_ARGS) "$$here"



cscope: cscope.files

	test ! -s cscope.files \

	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)



clean-cscope:

	-rm -f cscope.files



cscope.files: clean-cscope cscopelist-recursive cscopelist



cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)

	list='$(SOURCES) $(HEADERS) $(LISP)'; \

	case "$(srcdir)" in \

	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \

	  *) sdir=$(subdir)/$(srcdir) ;; \

	esac; \

	for i in $$list; do \

	  if test -f "$$i"; then \

	    echo "$(subdir)/$$i"; \

	  else \

	    echo "$$sdir/$$i"; \

	  fi; \

	done >> $(top_builddir)/cscope.files



distclean-tags:

	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files



distdir: $(DISTFILES)

	$(am__remove_distdir)
@@ -629,40 +637,36 @@ distdir: $(DISTFILES) 
	|| chmod -R a+r "$(distdir)"

dist-gzip: distdir

	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz

	$(am__remove_distdir)

	$(am__post_remove_distdir)



dist-bzip2: distdir

	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2

	$(am__remove_distdir)

	$(am__post_remove_distdir)



dist-lzip: distdir

	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz

	$(am__remove_distdir)



dist-lzma: distdir

	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma

	$(am__remove_distdir)

	$(am__post_remove_distdir)



dist-xz: distdir

	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz

	$(am__remove_distdir)

	$(am__post_remove_distdir)



dist-tarZ: distdir

	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z

	$(am__remove_distdir)

	$(am__post_remove_distdir)



dist-shar: distdir

	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz

	$(am__remove_distdir)

	$(am__post_remove_distdir)



dist-zip: distdir

	-rm -f $(distdir).zip

	zip -rq $(distdir).zip $(distdir)

	$(am__remove_distdir)

	$(am__post_remove_distdir)



dist dist-all: distdir

	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz

	$(am__remove_distdir)

dist dist-all:

	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'

	$(am__post_remove_distdir)



# This target untars the dist file and tries a VPATH configuration.  Then

# it guarantees that the distribution is self-contained by making another
@@ -673,8 +677,6 @@ distcheck: dist 
	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\

	*.tar.bz2*) \

	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\

	*.tar.lzma*) \

	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\

	*.tar.lz*) \

	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\

	*.tar.xz*) \
@@ -720,7 +722,7 @@ distcheck: dist 
	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \

	  && cd "$$am__cwd" \

	  || exit 1

	$(am__remove_distdir)

	$(am__post_remove_distdir)

	@(echo "$(distdir) archives ready for distribution: "; \

	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \

	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -859,12 +861,14 @@ ps-am: 
uninstall-am: uninstall-dist_pkgdataDATA



.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \

	ctags-recursive install-am install-strip tags-recursive

	cscopelist-recursive ctags-recursive install-am install-strip \

	tags-recursive



.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

	all all-am am--refresh check check-am clean clean-generic \

	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \

	dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \

	all all-am am--refresh check check-am clean clean-cscope \

	clean-generic clean-libtool cscope cscopelist \

	cscopelist-recursive ctags ctags-recursive dist dist-all \

	dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \

	dist-xz dist-zip distcheck distclean distclean-generic \

	distclean-hdr distclean-libtool distclean-tags distcleancheck \

	distdir distuninstallcheck dvi dvi-am html html-am info \

aclocal.m4

+200 −195

File changed.

Preview size limit exceeded, changes collapsed.

config.h.in

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ 
/* Define to 1 if your <sys/time.h> declares `struct tm'. */

#undef TM_IN_SYS_TIME



/* Triggers model-fitting and linking with ATLAS/FFTW */

/* Triggers model-fitting */

#undef USE_MODEL



/* Triggers multhreading */

configure

+156 −135

File changed.

Preview size limit exceeded, changes collapsed.

configure.ac

+28 −30
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:		17/08/2013

#	Last modified:		12/09/2013

#

#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],) 
define([AC_CACHE_SAVE],)



# This is your standard Bertin source code...

AC_INIT(sextractor, 2.19.2, [bertin@iap.fr])

AC_INIT(sextractor, 2.19.3, [bertin@iap.fr])

AC_CONFIG_SRCDIR(src/makeit.c)

AC_CONFIG_AUX_DIR(autoconf)

AC_CONFIG_HEADERS(config.h)
@@ -89,7 +89,7 @@ AC_ARG_ENABLE(mkl, 
AC_LANG(C)



AC_SEARCH_LIBS([strerror],[cposix])

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

if test x$enable_auto_flags = xyes; then

  CFLAGS=""

  LDFLAGS=""

  ACX_PROG_CC_OPTIM
@@ -105,7 +105,7 @@ AC_HEADER_STDC 
AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/mman.h \

		sys/types.h unistd.h])

# Checks for INTEL math header files.

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

if test x$enable_icc = xyes; then

  AC_CHECK_HEADERS(mathimf.h)

fi
@@ -161,11 +161,15 @@ AC_ARG_WITH(xsl_url, 
AC_DEFINE_UNQUOTED([XSL_URL], "$with_xsl_url",[Default URL of the XSLT filter])



# Provide special option to disable model-fitting (enabled by default)

AC_MSG_CHECKING([if model-fitting should be enabled])

AC_MSG_CHECKING([if model-fitting should be disabled])

AC_ARG_ENABLE([model-fitting],

	[AS_HELP_STRING([--enable-model-fitting],

	[Enable model-fitting and library dependencies (default = yes)])],

	AC_MSG_RESULT([yes]),

	[AS_HELP_STRING([--disable-model-fitting],

	[Disable model-fitting and library dependencies])],

	if test x$enable_model_fitting = xno; then

	  AC_MSG_RESULT([yes])

	else

	  AC_MSG_RESULT([no])

	fi,

	AC_MSG_RESULT([no]))



# Set flags for multithreading
@@ -173,11 +177,11 @@ n_pthreads=16 
AC_ARG_ENABLE(threads,

        [AS_HELP_STRING([--enable-threads@<:@=<max_number_of_threads>@:>@],

	[Enable multhreading (on with up to 16 threads by default)])],

    if test "$enableval" = "no"; then

    if test x$enableval = xno; then

      use_pthreads="no"

    else

      use_pthreads="yes"

      if test "$enableval" != "yes"; then

      if test x$enableval != xyes; then

        n_pthreads=$enableval

      fi

    fi,
@@ -203,19 +207,10 @@ the executable as portable as possible (off by default)])], 
	AC_MSG_RESULT([yes]),

	AC_MSG_RESULT([no]))



############# Actions to complete if model-fitting is activated ##############

AC_MSG_CHECKING([for model-fitting configure option])

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

  AC_MSG_RESULT([enabled])

  AC_DEFINE(USE_MODEL, 1, [Triggers model-fitting and linking with ATLAS/FFTW])

else

  AC_MSG_RESULT([disabled])

fi

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



################# Actions to complete in case of multhreading ################

AC_DEFINE_UNQUOTED(THREADS_NMAX, $n_pthreads,[Maximum number of POSIX threads])

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

if test x$use_pthreads = xyes; then

  AC_MSG_CHECKING([for multithreading])

  AC_MSG_RESULT([maximum of $n_pthreads thread(s)])

  AC_DEFINE(USE_THREADS, 1, [Triggers multhreading])
@@ -225,14 +220,16 @@ if test "$use_pthreads" = "yes"; then 
  [AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS -D_REENTRANT"]

  LIBS="$PTHREAD_LIBS $LIBS"

fi

AM_CONDITIONAL(USE_THREADS, [test $use_pthreads = "yes"])

AM_CONDITIONAL(USE_THREADS, [test x$use_pthreads = xyes])



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

############# Actions to complete if model-fitting is activated ##############

if test x$enable_model_fitting != xno; then

  AC_DEFINE(USE_MODEL, 1, [Triggers model-fitting])

############ handle the INTEL MKL library (FFTW + LAPACK) ###########

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

  if test x$enable_mkl = xyes; then

    convlibs="${srcdir}/wcs/libwcs_c.a,${srcdir}/levmar/liblevmar.a"

    ACX_MKL($with_mkl_dir,,$enable_best_link,$convlibs)

    if test "$MKL_WARN" != ""; then

    if test x$MKL_WARN != x; then

      AC_MSG_WARN([$MKL_WARN])

    fi

    AM_CFLAGS="$AM_CFLAGS $MKL_CFLAGS "
@@ -242,23 +239,24 @@ if test "$enable_model_fitting" = "yes"; then 
################ handle the FFTW library (Fourier transforms) ################

    ACX_FFTW($with_fftw_libdir,$with_fftw_incdir,$use_pthreads,yes,

	LIBS="$FFTW_LIBS $LIBS"

	if test "$FFTW_WARN" != ""; then

	if test x$FFTW_WARN != x; then

	  AC_MSG_WARN([$FFTW_WARN])

	fi,

	AC_MSG_ERROR([$FFTW_ERROR Exiting.]))

################## handle the ATLAS library(linear algebra) ##################

    ACX_ATLAS($with_atlas_libdir,$with_atlas_incdir,$use_pthreads,

	LIBS="$ATLAS_LIBS $LIBS"

	if test "$ATLAS_WARN" != ""; then

	if test x$ATLAS_WARN != x; then

	  AC_MSG_WARN([$ATLAS_WARN])

	fi,

	AC_MSG_ERROR([$ATLAS_ERROR Exiting.]))

  fi

fi

AM_CONDITIONAL(USE_MODEL, [test x$enable_model_fitting != xno])



# Compile with profiling option

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

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

if test x$enable_profiling = xyes; then

  if test x$enable_icc = xyes; then

    AM_CFLAGS="$AM_CFLAGS -pq"

  else

    AM_CFLAGS="$AM_CFLAGS -pg"
@@ -267,8 +265,8 @@ if test "$enable_profiling" = "yes"; then 
fi



# "Best" linking option

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

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

if test x$enable_best_link = xyes; then

  if test x$enable_icc = xyes; then

    AM_LDFLAGS="-static-intel -openmp-link static -shared-libgcc \

	-static-libtool-libs -no-intel-extensions -avoid-version $AM_LDFLAGS"

  else