Commit 22c7e544 authored by Chiara Marmo's avatar Chiara Marmo
Browse files

Solved issue with --disable-model-fitting configuration option. Pushed version number to 2.19.2

parent a3e5e107

Makefile.in

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

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

# @configure_input@



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



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

# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -82,15 +83,10 @@ 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)/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

	$(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 \
@@ -155,10 +151,9 @@ 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 \

	cscope distdir dist dist-all distcheck

	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)
@@ -169,7 +164,6 @@ 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,'; \
@@ -197,7 +191,6 @@ 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$$'
@@ -433,12 +426,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) $(RECURSIVE_CLEAN_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):

	@fail= failcom='exit 1'; \

	for f in x $$MAKEFLAGS; do \

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

	dot_seen=no; \

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

	case "$@" in \

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

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

	esac; \

	for subdir in $$list; do \

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

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

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

	    dot_seen=yes; \
@@ -466,6 +455,37 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_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); \
@@ -474,10 +494,6 @@ 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)'; \
@@ -541,32 +557,8 @@ 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)
@@ -637,36 +629,40 @@ distdir: $(DISTFILES) 
	|| chmod -R a+r "$(distdir)"

dist-gzip: distdir

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

	$(am__post_remove_distdir)

	$(am__remove_distdir)



dist-bzip2: distdir

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

	$(am__post_remove_distdir)

	$(am__remove_distdir)



dist-lzip: distdir

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

	$(am__post_remove_distdir)

	$(am__remove_distdir)



dist-lzma: distdir

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

	$(am__remove_distdir)



dist-xz: distdir

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

	$(am__post_remove_distdir)

	$(am__remove_distdir)



dist-tarZ: distdir

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

	$(am__post_remove_distdir)

	$(am__remove_distdir)



dist-shar: distdir

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

	$(am__post_remove_distdir)

	$(am__remove_distdir)



dist-zip: distdir

	-rm -f $(distdir).zip

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

	$(am__post_remove_distdir)

	$(am__remove_distdir)



dist dist-all:

	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_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)



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

# it guarantees that the distribution is self-contained by making another
@@ -677,6 +673,8 @@ 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*) \
@@ -722,7 +720,7 @@ distcheck: dist 
	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \

	  && cd "$$am__cwd" \

	  || exit 1

	$(am__post_remove_distdir)

	$(am__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'
@@ -861,14 +859,12 @@ ps-am: 
uninstall-am: uninstall-dist_pkgdataDATA



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

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

	tags-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-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 \

	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 \

	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

+195 −200

File changed.

Preview size limit exceeded, changes collapsed.

configure

+93 −122
Original line number Diff line number Diff line 
#! /bin/sh

# Guess values for system-dependent variables and create Makefiles.

# Generated by GNU Autoconf 2.69 for sextractor 2.19.1.

# Generated by GNU Autoconf 2.69 for sextractor 2.19.2.

#

# Report bugs to <bertin@iap.fr>.

#
@@ -590,8 +590,8 @@ MAKEFLAGS= 
# Identity of this package.

PACKAGE_NAME='sextractor'

PACKAGE_TARNAME='sextractor'

PACKAGE_VERSION='2.19.1'

PACKAGE_STRING='sextractor 2.19.1'

PACKAGE_VERSION='2.19.2'

PACKAGE_STRING='sextractor 2.19.2'

PACKAGE_BUGREPORT='bertin@iap.fr'

PACKAGE_URL=''
@@ -1345,7 +1345,7 @@ if test "$ac_init_help" = "long"; then 
  # Omit some internal or obsolete options to make the list less imposing.

  # This message is too long to be a string in the A/UX 3.1 sh.

  cat <<_ACEOF

\`configure' configures sextractor 2.19.1 to adapt to many kinds of systems.

\`configure' configures sextractor 2.19.2 to adapt to many kinds of systems.



Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1415,7 +1415,7 @@ fi 


if test -n "$ac_init_help"; then

  case $ac_init_help in

     short | recursive ) echo "Configuration of sextractor 2.19.1:";;

     short | recursive ) echo "Configuration of sextractor 2.19.2:";;

   esac

  cat <<\_ACEOF
@@ -1429,18 +1429,16 @@ Optional Features: 
                          compiler (off by default)

  --enable-mkl            Use INTEL's MKL for solvers and FFTs (off by

                          default)

  --enable-dependency-tracking

                          do not reject slow dependency extractors

  --disable-dependency-tracking

                          speeds up one-time build

  --disable-dependency-tracking  speeds up one-time build

  --enable-dependency-tracking   do not reject slow dependency extractors

  --enable-shared[=PKGS]  build shared libraries [default=yes]

  --enable-static[=PKGS]  build static libraries [default=yes]

  --enable-fast-install[=PKGS]

                          optimize for fast installation [default=yes]

  --disable-libtool-lock  avoid locking (might break parallel builds)

  --disable-largefile     omit support for large files

  --disable-model-fitting Disable model-fitting and library dependencies

                          (enabled by default)

  --enable-model-fitting  Enable model-fitting and library dependencies

                          (default = yes)

  --enable-threads[=<max_number_of_threads>]

                          Enable multhreading (on with up to 16 threads by

                          default)
@@ -1549,7 +1547,7 @@ fi 
test -n "$ac_init_help" && exit $ac_status

if $ac_init_version; then

  cat <<\_ACEOF

sextractor configure 2.19.1

sextractor configure 2.19.2

generated by GNU Autoconf 2.69



Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1972,7 +1970,7 @@ cat >config.log <<_ACEOF 
This file contains any messages produced by compilers while

running configure, to aid debugging if configure makes a mistake.



It was created by sextractor $as_me 2.19.1, which was

It was created by sextractor $as_me 2.19.2, which was

generated by GNU Autoconf 2.69.  Invocation command line was



  $ $0 $@
@@ -2339,7 +2337,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. 


ac_config_headers="$ac_config_headers config.h"



am__api_version='1.12'

am__api_version='1.11'



# Find a good install program.  We prefer a C program (faster),

# so one script is as good as another.  But avoid the broken or
@@ -2436,6 +2434,9 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' 


{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5

$as_echo_n "checking whether build environment is sane... " >&6; }

# Just in case

sleep 1

echo timestamp > conftest.file

# Reject unsafe characters in $srcdir or the absolute working directory

# name.  Accept space and tab only in the latter.

am_lf='
@@ -2446,23 +2447,21 @@ case `pwd` in 
esac

case $srcdir in

  *[\\\"\#\$\&\'\`$am_lf\ \	]*)

    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;

    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;

esac



# Do 'set' in a subshell so we don't clobber the current shell's

# Do `set' in a subshell so we don't clobber the current shell's

# arguments.  Must try -L first in case configure is actually a

# symlink; some systems play weird games with the mod time of symlinks

# (eg FreeBSD returns the mod time of the symlink's containing

# directory).

if (

   am_has_slept=no

   for am_try in 1 2; do

     echo "timestamp, slept: $am_has_slept" > conftest.file

   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`

   if test "$*" = "X"; then

      # -L didn't work.

      set X `ls -t "$srcdir/configure" conftest.file`

   fi

   rm -f conftest.file

   if test "$*" != "X $srcdir/configure conftest.file" \

      && test "$*" != "X conftest.file $srcdir/configure"; then
@@ -2473,13 +2472,7 @@ if ( 
      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken

alias in your environment" "$LINENO" 5

   fi

     if test "$2" = conftest.file || test $am_try -eq 2; then

       break

     fi

     # Just in case.

     sleep 1

     am_has_slept=yes

   done



   test "$2" = conftest.file

   )

then
@@ -2491,16 +2484,6 @@ Check your system clock" "$LINENO" 5 
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

$as_echo "yes" >&6; }

# If we didn't sleep, we still need to ensure time stamps of config.status and

# generated files are strictly newer.

am_sleep_pid=

if grep 'slept: no' conftest.file >/dev/null 2>&1; then

  ( sleep 1 ) &

  am_sleep_pid=$!

fi



rm -f conftest.file



test "$program_prefix" != NONE &&

  program_transform_name="s&^&$program_prefix&;$program_transform_name"

# Use a double $ so make ignores it.
@@ -2527,8 +2510,8 @@ if eval "$MISSING --run true"; then 
  am_missing_run="$MISSING --run "

else

  am_missing_run=

  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5

$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}

  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5

$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}

fi



if test x"${install_sh}" != xset; then
@@ -2540,10 +2523,10 @@ if test x"${install_sh}" != xset; then 
  esac

fi



# Installed binaries are usually stripped using 'strip' when the user

# run "make install-strip".  However 'strip' might not be the right

# Installed binaries are usually stripped using `strip' when the user

# run `make install-strip'.  However `strip' might not be the right

# tool to use in cross-compilation environments, therefore Automake

# will honor the 'STRIP' environment variable to overrule this program.

# will honor the `STRIP' environment variable to overrule this program.

if test "$cross_compiling" != no; then

  if test -n "$ac_tool_prefix"; then

  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2682,6 +2665,12 @@ fi 
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5

$as_echo "$MKDIR_P" >&6; }



mkdir_p="$MKDIR_P"

case $mkdir_p in

  [\\/$]* | ?:[\\/]*) ;;

  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;

esac



for ac_prog in gawk mawk nawk awk

do

  # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2786,7 +2775,7 @@ fi 


# Define the identity of the package.

 PACKAGE='sextractor'

 VERSION='2.19.1'

 VERSION='2.19.2'





cat >>confdefs.h <<_ACEOF
@@ -2814,12 +2803,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} 


MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}



# For better backward compatibility.  To be removed once Automake 1.9.x

# dies out for good.  For more background, see:

# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>

# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>

mkdir_p='$(MKDIR_P)'



# We need awk for the "check" target.  The system "awk" is bad on

# some platforms.

# Always define AMTAR for backward compatibility.  Yes, it's still used
@@ -2951,7 +2934,7 @@ am__quote= 
_am_result=none

# First try GNU make style include.

echo "include confinc" > confmf

# Ignore all kinds of additional output from 'make'.

# Ignore all kinds of additional output from `make'.

case `$am_make -s -f confmf 2> /dev/null` in #(

*the\ am__doit\ target*)

  am__include=include
@@ -3795,8 +3778,8 @@ else 
  # We make a subdir and do the tests there.  Otherwise we can end up

  # making bogus files that we don't know about and never remove.  For

  # instance it was reported that on HP-UX the gcc test will end up

  # making a dummy file named 'D' -- because '-MD' means "put the output

  # in D".

  # making a dummy file named `D' -- because `-MD' means `put the output

  # in D'.

  rm -rf conftest.dir

  mkdir conftest.dir

  # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -3831,16 +3814,16 @@ else 
    : > sub/conftest.c

    for i in 1 2 3 4 5 6; do

      echo '#include "conftst'$i'.h"' >> sub/conftest.c

      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with

      # Solaris 10 /bin/sh.

      echo '/* dummy */' > sub/conftst$i.h

      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with

      # Solaris 8's {/usr,}/bin/sh.

      touch sub/conftst$i.h

    done

    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf



    # We check with '-c' and '-o' for the sake of the "dashmstdout"

    # We check with `-c' and `-o' for the sake of the "dashmstdout"

    # mode.  It turns out that the SunPro C++ compiler does not properly

    # handle '-M -o', and we need to detect this.  Also, some Intel

    # versions had trouble with output in subdirs.

    # handle `-M -o', and we need to detect this.  Also, some Intel

    # versions had trouble with output in subdirs

    am__obj=sub/conftest.${OBJEXT-o}

    am__minus_obj="-o $am__obj"

    case $depmode in
@@ -3849,8 +3832,8 @@ else 
      test "$am__universal" = false || continue

      ;;

    nosideeffect)

      # After this tag, mechanisms are not by side-effect, so they'll

      # only be used when explicitly requested.

      # after this tag, mechanisms are not by side-effect, so they'll

      # only be used when explicitly requested

      if test "x$enable_dependency_tracking" = xyes; then

	continue

      else
@@ -3858,7 +3841,7 @@ else 
      fi

      ;;

    msvc7 | msvc7msys | msvisualcpp | msvcmsys)

      # This compiler won't grok '-c -o', but also, the minuso test has

      # This compiler won't grok `-c -o', but also, the minuso test has

      # not run yet.  These depmodes are late enough in the game, and

      # so weak that their functioning should not be impacted.

      am__obj=conftest.${OBJEXT-o}
@@ -5347,10 +5330,6 @@ freebsd* | dragonfly*) 
  fi

  ;;



gnu*)

  lt_cv_deplibs_check_method=pass_all

  ;;



haiku*)

  lt_cv_deplibs_check_method=pass_all

  ;;
@@ -5389,11 +5368,11 @@ irix5* | irix6* | nonstopux*) 
  ;;



# This must be glibc/ELF.

linux* | k*bsd*-gnu | kopensolaris*-gnu)

linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)

  lt_cv_deplibs_check_method=pass_all

  ;;



netbsd*)

netbsd* | netbsdelf*-gnu)

  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then

    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'

  else
@@ -8311,7 +8290,7 @@ lt_prog_compiler_static= 
      lt_prog_compiler_static='-non_shared'

      ;;



    linux* | k*bsd*-gnu | kopensolaris*-gnu)

    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)

      case $cc_basename in

      # old Intel for x86_64 which still supported -KPIC.

      ecc*)
@@ -8789,6 +8768,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie 
  openbsd*)

    with_gnu_ld=no

    ;;

  linux* | k*bsd*-gnu | gnu*)

    link_all_deplibs=no

    ;;

  esac



  ld_shlibs=yes
@@ -9010,7 +8992,7 @@ _LT_EOF 
      fi

      ;;



    netbsd*)

    netbsd* | netbsdelf*-gnu)

      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

	wlarc=
@@ -9187,6 +9169,7 @@ _LT_EOF 
	if test "$aix_use_runtimelinking" = yes; then

	  shared_flag="$shared_flag "'${wl}-G'

	fi

	link_all_deplibs=no

      else

	# not using gcc

	if test "$host_cpu" = ia64; then
@@ -9640,7 +9623,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } 
      link_all_deplibs=yes

      ;;



    netbsd*)

    netbsd* | netbsdelf*-gnu)

      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out

      else
@@ -10477,17 +10460,6 @@ freebsd* | dragonfly*) 
  esac

  ;;



gnu*)

  version_type=linux # correct to gnu/linux during the next big refactor

  need_lib_prefix=no

  need_version=no

  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'

  soname_spec='${libname}${release}${shared_ext}$major'

  shlibpath_var=LD_LIBRARY_PATH

  shlibpath_overrides_runpath=no

  hardcode_into_libs=yes

  ;;



haiku*)

  version_type=linux # correct to gnu/linux during the next big refactor

  need_lib_prefix=no
@@ -10604,7 +10576,7 @@ linux*oldld* | linux*aout* | linux*coff*) 
  ;;



# This must be glibc/ELF.

linux* | k*bsd*-gnu | kopensolaris*-gnu)

linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)

  version_type=linux # correct to gnu/linux during the next big refactor

  need_lib_prefix=no

  need_version=no
@@ -10653,14 +10625,10 @@ fi 
  # before this can be enabled.

  hardcode_into_libs=yes



  # Add ABI-specific directories to the system library path.

  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"



  # Append ld.so.conf contents to the search path

  if test -f /etc/ld.so.conf; then

    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`

    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"



    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

  fi



  # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -10672,6 +10640,18 @@ fi 
  dynamic_linker='GNU/Linux ld.so'

  ;;



netbsdelf*-gnu)

  version_type=linux

  need_lib_prefix=no

  need_version=no

  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

  soname_spec='${libname}${release}${shared_ext}$major'

  shlibpath_var=LD_LIBRARY_PATH

  shlibpath_overrides_runpath=no

  hardcode_into_libs=yes

  dynamic_linker='NetBSD ld.elf_so'

  ;;



netbsd*)

  version_type=sunos

  need_lib_prefix=no
@@ -12946,19 +12926,16 @@ _ACEOF 




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

enable_model_fitting="yes"

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if model-fitting should be disabled" >&5

$as_echo_n "checking if model-fitting should be disabled... " >&6; }

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if model-fitting should be enabled" >&5

$as_echo_n "checking if model-fitting should be enabled... " >&6; }

# Check whether --enable-model-fitting was given.

if test "${enable_model_fitting+set}" = set; then :

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

	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

  enableval=$enable_model_fitting; { $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

$as_echo "no" >&6; }

fi

fi





# Set flags for multithreading
@@ -15276,14 +15253,6 @@ LIBOBJS=$ac_libobjs 
LTLIBOBJS=$ac_ltlibobjs





{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5

$as_echo_n "checking that generated files are newer than configure... " >&6; }

   if test -n "$am_sleep_pid"; then

     # Hide warnings about reused PIDs.

     wait $am_sleep_pid 2>/dev/null

   fi

   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5

$as_echo "done" >&6; }

 if test -n "$EXEEXT"; then

  am__EXEEXT_TRUE=

  am__EXEEXT_FALSE='#'
@@ -15705,7 +15674,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 
# report actual input values of CONFIG_FILES etc. instead of their

# values after options handling.

ac_log="

This file was extended by sextractor $as_me 2.19.1, which was

This file was extended by sextractor $as_me 2.19.2, which was

generated by GNU Autoconf 2.69.  Invocation command line was



  CONFIG_FILES    = $CONFIG_FILES
@@ -15771,7 +15740,7 @@ _ACEOF 
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"

ac_cs_version="\\

sextractor config.status 2.19.1

sextractor config.status 2.19.2

configured by $0, generated by GNU Autoconf 2.69,

  with options \\"\$ac_cs_config\\"
@@ -16798,7 +16767,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} 
    # Strip MF so we end up with the name of the file.

    mf=`echo "$mf" | sed -e 's/:.*$//'`

    # Check whether this is an Automake generated Makefile or not.

    # We used to match only the files named 'Makefile.in', but

    # We used to match only the files named `Makefile.in', but

    # some people rename them; so instead we look at the file content.

    # Grep'ing the first line is not enough: some people post-process

    # each Makefile.in and add a new line on top of each file to say so.
@@ -16832,19 +16801,21 @@ $as_echo X"$mf" | 
      continue

    fi

    # Extract the definition of DEPDIR, am__include, and am__quote

    # from the Makefile without running 'make'.

    # from the Makefile without running `make'.

    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

    test -z "$DEPDIR" && continue

    am__include=`sed -n 's/^am__include = //p' < "$mf"`

    test -z "am__include" && continue

    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

    # When using ansi2knr, U may be empty or an underscore; expand it

    U=`sed -n 's/^U = //p' < "$mf"`

    # Find all dependency output files, they are included files with

    # $(DEPDIR) in their names.  We invoke sed twice because it is the

    # simplest approach to changing $(DEPDIR) to its actual value in the

    # expansion.

    for file in `sed -n "

      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \

	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do

	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

      # Make sure the directory exists.

      test -f "$dirpart/$file" && continue

      fdir=`$as_dirname -- "$file" ||

configure.ac

+7 −11
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/07/2013

#	Last modified:		17/08/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.1, [bertin@iap.fr])

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

AC_CONFIG_SRCDIR(src/makeit.c)

AC_CONFIG_AUX_DIR(autoconf)

AC_CONFIG_HEADERS(config.h)
@@ -161,16 +161,12 @@ 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)

enable_model_fitting="yes"

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

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

AC_ARG_ENABLE([model-fitting],

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

	[Disable model-fitting and library dependencies (enabled by default)])],

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

	  AC_MSG_RESULT([yes])

	else

	  AC_MSG_RESULT([no])

	fi)

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

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

	AC_MSG_RESULT([yes]),

	AC_MSG_RESULT([no]))



# Set flags for multithreading

n_pthreads=16

man/Makefile.in

+7 −9

File changed.

Preview size limit exceeded, changes collapsed.