Commit 78801391 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Added --disable-model-fitting configure option to turn-off model-fitting... 

Added --disable-model-fitting configure option to turn-off model-fitting features and to allow compiling SExtractor without requiring the ATLAS and FFTW libraries.
Version number pushed to 2.12.0.
parent b13bfdc5

config.h.in

+3 −0
Original line number Diff line number Diff line
@@ -197,6 +197,9 @@ 
/* Define to 1 if your <sys/time.h> declares `struct tm'. */

#undef TM_IN_SYS_TIME



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

#undef USE_MODEL



/* Triggers multhreading */

#undef USE_THREADS

configure

+105 −47
Original line number Diff line number Diff line 
#! /bin/sh

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

# Generated by GNU Autoconf 2.63 for sextractor 2.11.11.

# Generated by GNU Autoconf 2.63 for sextractor 2.12.0.

#

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

#
@@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} 
# Identity of this package.

PACKAGE_NAME='sextractor'

PACKAGE_TARNAME='sextractor'

PACKAGE_VERSION='2.11.11'

PACKAGE_STRING='sextractor 2.11.11'

PACKAGE_VERSION='2.12.0'

PACKAGE_STRING='sextractor 2.12.0'

PACKAGE_BUGREPORT='bertin@iap.fr'









ac_unique_file="src/makeit.c"








@@ -808,6 +808,8 @@ USE_THREADS_TRUE







PTHREAD_CFLAGS









PTHREAD_LIBS









PTHREAD_CC









USE_MODEL_FALSE









USE_MODEL_TRUE









LIBOBJS









LIBTOOL









ac_ct_F77








@@ -934,6 +936,7 @@ with_atlas_incdir







with_fftw









with_fftw_incdir









with_xsl_url









enable_model_fitting









enable_threads









enable_gprof









enable_best_link








@@ -1505,7 +1508,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.11.11 to adapt to many kinds of systems.









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

















Usage: $0 [OPTION]... [VAR=VALUE]...
















@@ -1575,7 +1578,7 @@ fi















if test -n "$ac_init_help"; then









  case $ac_init_help in









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









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









   esac









  cat <<\_ACEOF
















@@ -1595,6 +1598,8 @@ Optional Features:







                          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 ATLAS/FFTW dependency









                          (enabled by default)









  --enable-threads[=<max_number_of_threads>]









                          Enable multhreading (on with up to 16 threads by









                          default)








@@ -1706,7 +1711,7 @@ fi







test -n "$ac_init_help" && exit $ac_status









if $ac_init_version; then









  cat <<\_ACEOF









sextractor configure 2.11.11









sextractor configure 2.12.0









generated by GNU Autoconf 2.63

















Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,








@@ -1720,7 +1725,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.11.11, which was









It was created by sextractor $as_me 2.12.0, which was









generated by GNU Autoconf 2.63.  Invocation command line was

















  $ $0 $@








@@ -2423,7 +2428,7 @@ fi















# Define the identity of the package.









 PACKAGE='sextractor'









 VERSION='2.11.11'









 VERSION='2.12.0'

























cat >>confdefs.h <<_ACEOF








@@ -5316,7 +5321,7 @@ ia64-*-hpux*)







  ;;









*-*-irix6*)









  # Find out which ABI we are using.









  echo '#line 5319 "configure"' > conftest.$ac_ext









  echo '#line 5324 "configure"' > conftest.$ac_ext









  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5









  (eval $ac_compile) 2>&5









  ac_status=$?








@@ -8091,11 +8096,11 @@ else







   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \









   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \









   -e 's:$: $lt_compiler_flag:'`









   (eval echo "\"\$as_me:8094: $lt_compile\"" >&5)









   (eval echo "\"\$as_me:8099: $lt_compile\"" >&5)









   (eval "$lt_compile" 2>conftest.err)









   ac_status=$?









   cat conftest.err >&5









   echo "$as_me:8098: \$? = $ac_status" >&5









   echo "$as_me:8103: \$? = $ac_status" >&5









   if (exit $ac_status) && test -s "$ac_outfile"; then









     # The compiler can only warn and ignore the option if not recognized









     # So say no if there are warnings other than the usual output.








@@ -8381,11 +8386,11 @@ else







   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \









   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \









   -e 's:$: $lt_compiler_flag:'`









   (eval echo "\"\$as_me:8384: $lt_compile\"" >&5)









   (eval echo "\"\$as_me:8389: $lt_compile\"" >&5)









   (eval "$lt_compile" 2>conftest.err)









   ac_status=$?









   cat conftest.err >&5









   echo "$as_me:8388: \$? = $ac_status" >&5









   echo "$as_me:8393: \$? = $ac_status" >&5









   if (exit $ac_status) && test -s "$ac_outfile"; then









     # The compiler can only warn and ignore the option if not recognized









     # So say no if there are warnings other than the usual output.








@@ -8485,11 +8490,11 @@ else







   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \









   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \









   -e 's:$: $lt_compiler_flag:'`









   (eval echo "\"\$as_me:8488: $lt_compile\"" >&5)









   (eval echo "\"\$as_me:8493: $lt_compile\"" >&5)









   (eval "$lt_compile" 2>out/conftest.err)









   ac_status=$?









   cat out/conftest.err >&5









   echo "$as_me:8492: \$? = $ac_status" >&5









   echo "$as_me:8497: \$? = $ac_status" >&5









   if (exit $ac_status) && test -s out/conftest2.$ac_objext









   then









     # The compiler can only warn and ignore the option if not recognized








@@ -10872,7 +10877,7 @@ else







  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2









  lt_status=$lt_dlunknown









  cat > conftest.$ac_ext <<EOF









#line 10875 "configure"









#line 10880 "configure"









#include "confdefs.h"

















#if HAVE_DLFCN_H








@@ -10972,7 +10977,7 @@ else







  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2









  lt_status=$lt_dlunknown









  cat > conftest.$ac_ext <<EOF









#line 10975 "configure"









#line 10980 "configure"









#include "confdefs.h"

















#if HAVE_DLFCN_H








@@ -13400,11 +13405,11 @@ else







   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \









   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \









   -e 's:$: $lt_compiler_flag:'`









   (eval echo "\"\$as_me:13403: $lt_compile\"" >&5)









   (eval echo "\"\$as_me:13408: $lt_compile\"" >&5)









   (eval "$lt_compile" 2>conftest.err)









   ac_status=$?









   cat conftest.err >&5









   echo "$as_me:13407: \$? = $ac_status" >&5









   echo "$as_me:13412: \$? = $ac_status" >&5









   if (exit $ac_status) && test -s "$ac_outfile"; then









     # The compiler can only warn and ignore the option if not recognized









     # So say no if there are warnings other than the usual output.








@@ -13504,11 +13509,11 @@ else







   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \









   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \









   -e 's:$: $lt_compiler_flag:'`









   (eval echo "\"\$as_me:13507: $lt_compile\"" >&5)









   (eval echo "\"\$as_me:13512: $lt_compile\"" >&5)









   (eval "$lt_compile" 2>out/conftest.err)









   ac_status=$?









   cat out/conftest.err >&5









   echo "$as_me:13511: \$? = $ac_status" >&5









   echo "$as_me:13516: \$? = $ac_status" >&5









   if (exit $ac_status) && test -s out/conftest2.$ac_objext









   then









     # The compiler can only warn and ignore the option if not recognized








@@ -15068,11 +15073,11 @@ else







   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \









   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \









   -e 's:$: $lt_compiler_flag:'`









   (eval echo "\"\$as_me:15071: $lt_compile\"" >&5)









   (eval echo "\"\$as_me:15076: $lt_compile\"" >&5)









   (eval "$lt_compile" 2>conftest.err)









   ac_status=$?









   cat conftest.err >&5









   echo "$as_me:15075: \$? = $ac_status" >&5









   echo "$as_me:15080: \$? = $ac_status" >&5









   if (exit $ac_status) && test -s "$ac_outfile"; then









     # The compiler can only warn and ignore the option if not recognized









     # So say no if there are warnings other than the usual output.








@@ -15172,11 +15177,11 @@ else







   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \









   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \









   -e 's:$: $lt_compiler_flag:'`









   (eval echo "\"\$as_me:15175: $lt_compile\"" >&5)









   (eval echo "\"\$as_me:15180: $lt_compile\"" >&5)









   (eval "$lt_compile" 2>out/conftest.err)









   ac_status=$?









   cat out/conftest.err >&5









   echo "$as_me:15179: \$? = $ac_status" >&5









   echo "$as_me:15184: \$? = $ac_status" >&5









   if (exit $ac_status) && test -s out/conftest2.$ac_objext









   then









     # The compiler can only warn and ignore the option if not recognized








@@ -17369,11 +17374,11 @@ else







   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \









   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \









   -e 's:$: $lt_compiler_flag:'`









   (eval echo "\"\$as_me:17372: $lt_compile\"" >&5)









   (eval echo "\"\$as_me:17377: $lt_compile\"" >&5)









   (eval "$lt_compile" 2>conftest.err)









   ac_status=$?









   cat conftest.err >&5









   echo "$as_me:17376: \$? = $ac_status" >&5









   echo "$as_me:17381: \$? = $ac_status" >&5









   if (exit $ac_status) && test -s "$ac_outfile"; then









     # The compiler can only warn and ignore the option if not recognized









     # So say no if there are warnings other than the usual output.








@@ -17659,11 +17664,11 @@ else







   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \









   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \









   -e 's:$: $lt_compiler_flag:'`









   (eval echo "\"\$as_me:17662: $lt_compile\"" >&5)









   (eval echo "\"\$as_me:17667: $lt_compile\"" >&5)









   (eval "$lt_compile" 2>conftest.err)









   ac_status=$?









   cat conftest.err >&5









   echo "$as_me:17666: \$? = $ac_status" >&5









   echo "$as_me:17671: \$? = $ac_status" >&5









   if (exit $ac_status) && test -s "$ac_outfile"; then









     # The compiler can only warn and ignore the option if not recognized









     # So say no if there are warnings other than the usual output.








@@ -17763,11 +17768,11 @@ else







   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \









   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \









   -e 's:$: $lt_compiler_flag:'`









   (eval echo "\"\$as_me:17766: $lt_compile\"" >&5)









   (eval echo "\"\$as_me:17771: $lt_compile\"" >&5)









   (eval "$lt_compile" 2>out/conftest.err)









   ac_status=$?









   cat out/conftest.err >&5









   echo "$as_me:17770: \$? = $ac_status" >&5









   echo "$as_me:17775: \$? = $ac_status" >&5









   if (exit $ac_status) && test -s out/conftest2.$ac_objext









   then









     # The compiler can only warn and ignore the option if not recognized








@@ -23353,6 +23358,24 @@ cat >>confdefs.h <<_ACEOF







_ACEOF

























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









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









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









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









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









  enableval=$enable_model_fitting; use_model="$enableval"









else









  use_model="yes"









fi

















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









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









$as_echo "yes" >&6; }









else









  { $as_echo "$as_me:$LINENO: result: no" >&5









$as_echo "no" >&6; }









fi

















# Set flags for multithreading









n_pthreads=16









# Check whether --enable-threads was given.








@@ -23399,6 +23422,30 @@ $as_echo "no" >&6; }







fi

























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









{ $as_echo "$as_me:$LINENO: checking for model-fitting configure option" >&5









$as_echo_n "checking for model-fitting configure option... " >&6; }









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









  { $as_echo "$as_me:$LINENO: result: enabled" >&5









$as_echo "enabled" >&6; }

















cat >>confdefs.h <<\_ACEOF









#define USE_MODEL 1









_ACEOF

















else









  { $as_echo "$as_me:$LINENO: result: disabled" >&5









$as_echo "disabled" >&6; }









fi









 if test $use_model = "yes"; then









  USE_MODEL_TRUE=









  USE_MODEL_FALSE='#'









else









  USE_MODEL_TRUE='#'









  USE_MODEL_FALSE=









fi

























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

















cat >>confdefs.h <<_ACEOF








@@ -23993,6 +24040,7 @@ fi























################ handle the FFTW library (Fourier transforms) ################









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
































@@ -25687,8 +25735,10 @@ else







$as_echo "$as_me: error: $FFTW_ERROR Exiting." >&2;}









   { (exit 1); exit 1; }; }









  fi









fi

















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









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
































@@ -28120,6 +28170,7 @@ else







$as_echo "$as_me: error: $ATLAS_ERROR Exiting." >&2;}









   { (exit 1); exit 1; }; }









  fi









fi

















# Link with gprof option









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








@@ -28206,6 +28257,13 @@ $as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.







Usually this means the macro was only invoked conditionally." >&2;}









   { (exit 1); exit 1; }; }









fi









if test -z "${USE_MODEL_TRUE}" && test -z "${USE_MODEL_FALSE}"; then









  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODEL\" was never defined.









Usually this means the macro was only invoked conditionally." >&5









$as_echo "$as_me: error: conditional \"USE_MODEL\" was never defined.









Usually this means the macro was only invoked conditionally." >&2;}









   { (exit 1); exit 1; }; }









fi









if test -z "${USE_THREADS_TRUE}" && test -z "${USE_THREADS_FALSE}"; then









  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_THREADS\" was never defined.









Usually this means the macro was only invoked conditionally." >&5








@@ -28535,7 +28593,7 @@ exec 6>&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.11.11, which was









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









generated by GNU Autoconf 2.63.  Invocation command line was

















  CONFIG_FILES    = $CONFIG_FILES








@@ -28598,7 +28656,7 @@ Report bugs to <bug-autoconf@gnu.org>."







_ACEOF









cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1









ac_cs_version="\\









sextractor config.status 2.11.11









sextractor config.status 2.12.0









configured by $0, generated by GNU Autoconf 2.63,









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

































configure.ac



+44
−16






























Original line number
Diff line number
Diff line







@@ -6,7 +6,7 @@ define([AC_CACHE_LOAD],)







define([AC_CACHE_SAVE],)



















# This is your standard Bertin source code...









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









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









AC_CONFIG_SRCDIR(src/makeit.c)









AC_CONFIG_AUX_DIR(autoconf)









AM_CONFIG_HEADER(config.h)








@@ -142,6 +142,20 @@ AC_ARG_WITH(xsl_url,

















AC_DEFINE_UNQUOTED([XSL_URL], "$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 disabled])









AC_ARG_ENABLE([model-fitting],









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









	[Disable model-fitting and ATLAS/FFTW dependency \









(enabled by default)])],









	[use_model="$enableval"],









	[use_model="yes"])









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









  AC_MSG_RESULT([yes])









else









  AC_MSG_RESULT([no])









fi



















# Set flags for multithreading









n_pthreads=16









AC_ARG_ENABLE(threads,








@@ -178,6 +192,16 @@ 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 "$use_model" = "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 $use_model = "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








@@ -190,9 +214,10 @@ 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 $use_pthreads = "yes"])



















################ handle the FFTW library (Fourier transforms) ################









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









  ACX_FFTW($fftw_libdir,$fftw_incdir,$use_pthreads,yes,









	[use_fftw=yes],[use_fftw=no])









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








@@ -203,8 +228,10 @@ if test "$use_fftw" = "yes"; then







  else









    AC_MSG_ERROR([$FFTW_ERROR Exiting.])









  fi









fi



















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









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









  ACX_ATLAS($atlas_libdir,$atlas_incdir,$use_pthreads,









	[use_atlas=yes],[use_atlas=no])









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








@@ -215,6 +242,7 @@ if test "$use_atlas" = "yes"; then







  else









    AC_MSG_ERROR([$ATLAS_ERROR Exiting.])









  fi









fi



















# Link with gprof option









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
































man/sex.1



+1
−1






























Original line number
Diff line number
Diff line









.TH SEXTRACTOR "1" "August 2010" "SWarp 2.11.11" "User Commands"









.TH SEXTRACTOR "1" "August 2010" "SWarp 2.12.0" "User Commands"









.SH NAME









sex \- extract a source catalog from an astronomical FITS image









.SH SYNOPSIS
































src/Makefile.am



+16
−8






























Original line number
Diff line number
Diff line









# Program Makefile for SEx









# Copyright (C) 2004-2010 Emmanuel Bertin.









SUBDIRS			= fits levmar wcs









if USE_MODEL









  FFTSOURCE		= fft.c









  PATTERNSOURCE		= pattern.c









  PROFITSOURCE		= profit.c









  LEVLIB		= $(top_builddir)/src/levmar/liblevmar.a









  LEVDIR		= levmar









endif









SUBDIRS			= fits $(LEVDIR) wcs









bin_PROGRAMS		= sex ldactoasc









check_PROGRAMS		= sex









sex_SOURCES		= analyse.c assoc.c astrom.c back.c bpro.c catout.c \









			  check.c clean.c extract.c fft.c field.c filter.c \









			  fitswcs.c flag.c graph.c growth.c header.c image.c \









			  interpolate.c main.c makeit.c manobjlist.c misc.c \









			  neurro.c pattern.c pc.c photom.c plist.c prefs.c \









			  profit.c psf.c readimage.c refine.c retina.c scan.c \









			  som.c weight.c winpos.c xml.c \









			  check.c clean.c extract.c $(FFTSOURCE) field.c \









			  filter.c fitswcs.c flag.c graph.c growth.c header.c \









			  image.c interpolate.c main.c makeit.c manobjlist.c \









			  misc.c neurro.c $(PATTERNSOURCE) pc.c photom.c \









			  plist.c prefs.c $(PROFITSOURCE) psf.c readimage.c \









			  refine.c retina.c scan.c som.c weight.c winpos.c \









			  xml.c \









			  assoc.h astrom.h back.h bpro.h check.h clean.h \









			  define.h extract.h fft.h field.h filter.h fitswcs.h \









			  flag.h globals.h growth.h header.h image.h \








@@ -21,7 +29,7 @@ sex_SOURCES		= analyse.c assoc.c astrom.c back.c bpro.c catout.c \







ldactoasc_SOURCES 	= ldactoasc.c ldactoasc.h









sex_LDADD		= $(top_builddir)/src/fits/libfits.a \









			  $(top_builddir)/src/wcs/libwcs_c.a \









			  $(top_builddir)/src/levmar/liblevmar.a 









			  $(LEVLIB) 









ldactoasc_LDADD		= $(top_builddir)/src/fits/libfits.a









DATE=`date +"%Y-%m-%d"`