Moved the whole package back to GPL.

Added more complete headers to all files.
Clarified licensing issues.
Updated FITS library.
Updated configuration files.
Added configuration files to the list of data that get installed in ${prefix}/share/sextractor.
Added background offset and point-source model components: FLUX_BACKOFFSET,FLUXERR_BACKOFFSET,FLUX_POINTSOURCE,FLUXERR_POINTSOURCE,MAG_POINTSOURCE,MAGERR_POINTSOURCE.
Tweaked model-fitting convergence parameters.
Fixed catalogue source ordering/number issue in dual-image mode.
Pushed version number to 2.13.0.

AUTHORS

-Emmanuel Bertin <bertin@iap.fr> :	SExtractor code and FITS library
+Emmanuel Bertin <bertin@iap.fr> :	SExtractor code
+

BUGS

-V2.5 (2006-07-14)
-COOSYS epoch and system are not set to the proper values in ASCII_VOTABLE
-catalogs.
-Unexpected crashes are experienced when working with extremely large images
-(10+Gpixels). This was not the case with earlier versions (ca. 1999).
-V2.3 (2002-12-17)
 ASSOC options do not work properly with MEF images (this is not really a bug).
 
 				Emmanuel Bertin <bertin@iap.fr>
+

COPYRIGHT

-Copyright (c) 1995-2009 Emmanuel Bertin <bertin@iap.fr> IAP-CNRS/Univ,P.&M.Curie
-
-This software is governed by the CeCILL license under French law and
-abiding by the rules of distribution of free software.  You can  use, 
-modify and/ or redistribute the software under the terms of the CeCILL
-license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info". 
-
-As a counterpart to the access to the source code and  rights to copy,
-modify and redistribute granted by the license, users are provided only
-with a limited warranty  and the software's author,  the holder of the
-economic rights,  and the successive licensors  have only  limited
-liability. 
-
-In this respect, the user's attention is drawn to the risks associated
-with loading,  using,  modifying and/or developing or reproducing the
-software by the user in light of its specific status of free software,
-that may mean  that it is complicated to manipulate,  and  that  also
-therefore means  that it is reserved for developers  and  experienced
-professionals having in-depth computer knowledge. Users are therefore
-encouraged to load and test the software's suitability as regards their
-requirements in conditions enabling the security of their systems and/or 
-data to be ensured and,  more generally, to use and operate it in the 
-same conditions as regards security. 
-
-The fact that you are presently reading this means that you have had
-knowledge of the CeCILL license and that you accept its terms.
+Copyright 1994-2010 IAP-CNRS / Universite P.&M.Curie
+
+Author:	  Emmanuel Bertin <bertin@iap.fr>
+
+SExtractor is free software: you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+SExtractor is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with SExtractor. If not, see <http://www.gnu.org/licenses/>.
 

HISTORY

-Dec 07: 2.7
+October 2010: 2.13
+	- Adaptive CLASS_STAR
+	- Model-fitting.
+	- Licensing back to GPL
+
+December 2009: 2.10
+	- Support for FLAGS_WEIGHT
+
+December 2007: 2.7
 	- FITS I/O and astrometry layers updated (same as SWarp and SCAMP)
-	- Support for model-fitting
+	- Early support for model-fitting
 
-Jul 06: 2.5
+July 2006: 2.5
         - Support for VOTable catalogs and metadata in output.
 
-Aug 05: 2.4
+August 2005: 2.4
         - New windowed measurement parameters
         - Better FITS compliancy of output files
 
-May 03: 2.3
+May 2003: 2.3
 	- Autoconf'ed package.
 	- Dumpable internal config file
 	- Large File Support
 	- Support for MEF files
 
-Feb 01: 2.2
-	- Mostly bug fixes and experimental stuff added
+February 2001: 2.2
+	- Mostly bug fixes and experimental stuff added (PSF-fitting)
 
-May 99: 2.1
+May 1999: 2.1
 	- Mostly bug fixes and experimental stuff added
 
-April 98: 2.0
+April 1998: 2.0
 	- New documentation
 
-January 97 - March 98:1.2
+January 1997 - March 1998:1.2
 	- Rewriting of an important part of the software, in order to
 	  prepare the future... Further optimization of many functions:
 	  V1.2 is 30 to 500% faster than V1.0.
@@ -47,12 +55,12 @@ January 97 - March 98:1.2
           maps, with interpolation.
         - Real-time cross-identification with an ASCII catalog.
 
-May 96:	1.1 "DeNIS" version (not distributed officially)
+May 1996:	1.1 "DeNIS" version (not distributed officially)
 	- Corrects 2 fatal bugs which sometimes appeared with DEC-Alphas
 	- Incorporates a new extended FITS output format.
 	- Added possibility to measure within multiple apertures.
 
-May 95: Passed 1.0a version: -> FIRST OFFICIAL RELEASE!!! <-
+May 1995: Passed 1.0a version: -> FIRST OFFICIAL RELEASE!!! <-
 	- Now the NNW filename is correct in FITS catalog headers.
 	- Corrected a convolution bug with large masks at the bottom of
 	  the frame. Added a better-than-nothing normalization of
@@ -64,7 +72,7 @@ May 95: Passed 1.0a version: -> FIRST OFFICIAL RELEASE!!! <-
 	  right one! Replaced.
 	- 2 new SExtools released: sexreduce and sexin.
 
-Apr 95: FIRST 1.0 version:
+Apr 1995: FIRST 1.0 version:
 	- Neural-network based star/galaxy classifier implemented. NNW-file
 	  for Moffat-like PSFs in the optical, generated from simulations.
 	- User's manual updated.
@@ -75,19 +83,19 @@ Apr 95: FIRST 1.0 version:
 	- 2 SExTools released: sexcat and sexcopy.
 	- Alpha VMS version added (thanks to R. Johnstone).
 
-Feb 95: 1.0 beta 5e version:
+Feb 1995: 1.0 beta 5e version:
 	- 2 bugs major corrected: background interpolation when very special
 	  convolution masks are used, and (fixed) aperture magnitude (improved
 	  to sub-pixel integration).
 	- Possibility to change preference keywords from the command line.
 
-Dec 94: 1.0 beta 5 version:
+Dec 1994: 1.0 beta 5 version:
 	- Major update! Too many changes to mention.
 	- Code optimized and much more stable now.
 	- New executables for IBM RS6000 and AMIGA added.
 	- "II" dropped: call me simply "SExtractor" now.
 
-Sep 94: 1.0 beta 4 version:
+Sep 1994: 1.0 beta 4 version:
 	- "clean" distribution with source and makefiles for DEC Alpha,
 	  HP/UX, and SUN workstations.
 	- SATUR_LEVEL keyword added.
@@ -100,18 +108,19 @@ Sep 94: 1.0 beta 4 version:
 	  procedures.
 
 
-Jun 94: 1.0 beta 3 version: many bugs corrected thanks to enthousiastic
+Jun 1994: 1.0 beta 3 version: many bugs corrected thanks to enthousiastic
 	testers! First public release.
 
-May 94: 1.0 beta 2 version: reads now all kinds of FITS data. C code
+May 1994: 1.0 beta 2 version: reads now all kinds of FITS data. C code
 	completely rewritten in ANSI; image bitmaps are now stored in
 	floating-point. Now controlled through configuration files.
 	User's manual written.
 
-Feb 94: 1.0 beta 1 version of "Sextractor II", still limited to 16 bits FITS
+Feb 1994: 1.0 beta 1 version of "Sextractor II", still limited to 16 bits FITS
 	frames, but pipelined processing allows now frames with size up to
 	65534x65534 to be processable on most machines.
 
-Mar 93: final version of "Sextractor I": limited to 16 bits 2048x2048 max. FITS
+Mar 1993: final version of "Sextractor I": limited to 16 bits 2048x2048 max. FITS
 	frames, specifically oriented toward Schmidt plate data processing.
 	Has reduced more than 1.2e10 pixels within 10 months...
+

INSTALL

@@ -14,17 +14,6 @@ The simplest way to compile this package is:
   3. Type `make install' to install the programs and any data files and
      documentation.
 
-Optional Features
-=================
-The executable is dynamically linked by default. If you have the necessary
-static libraries installed, you might want to turn on static linking by typing
-
-     ./configure --enable-static
-
-A statically-linked executable takes more disk and memory space; however it
-runs generally faster and it will work on any similar system independently of
-the libraries available.
-
 Compilers and Options
 =====================
 

Makefile.am

-# Main Makefile for SExtractor
-# Copyright (C) 2002-2009 Emmanuel Bertin.
+#
+#				Makefile.am
+#
+# Main Makefile. Process this file with automake to generate a Makefile
+#
+#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+#
+#	This file part of:	SExtractor
+#
+#	Copyright:		(C) 2002-2010 IAP/CNRS/UPMC
+#
+#	Author:			Emmanuel Bertin (IAP)
+#
+#	License:		GNU General Public License
+#
+#	SExtractor is free software: you can redistribute it and/or modify
+#	it under the terms of the GNU General Public License as published by
+#	the Free Software Foundation, either version 3 of the License, or
+# 	(at your option) any later version.
+#	SExtractor is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#	GNU General Public License for more details.
+#	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:		11/10/2010
+#
+#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 AUTOMAKE_OPTIONS	= foreign no-dependencies
 SUBDIRS			= man src tests
-dist_pkgdata_DATA	= xsl/sextractor.xsl
-EXTRA_DIST		= config doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY \
-			  INSTALL README THANKS \
+dist_pkgdata_DATA	= config/* xsl/sextractor.xsl
+EXTRA_DIST		= doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY \
+			  INSTALL LICENSE README THANKS \
 			  acx_atlas.m4 acx_prog_cc_optim.m4 \
 			  acx_urbi_resolve_dir.m4
 RPM_ROOTDIR		= `rpmbuild --nobuild -E %_topdir`

Makefile.in

@@ -14,6 +14,36 @@
 
 @SET_MAKE@
 
+#
+#				Makefile.am
+#
+# Main Makefile. Process this file with automake to generate a Makefile
+#
+#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+#
+#	This file part of:	SExtractor
+#
+#	Copyright:		(C) 2002-2010 IAP/CNRS/UPMC
+#
+#	Author:			Emmanuel Bertin (IAP)
+#
+#	License:		GNU General Public License
+#
+#	SExtractor is free software: you can redistribute it and/or modify
+#	it under the terms of the GNU General Public License as published by
+#	the Free Software Foundation, either version 3 of the License, or
+# 	(at your option) any later version.
+#	SExtractor is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#	GNU General Public License for more details.
+#	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:		11/10/2010
+#
+#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -213,14 +243,11 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-
-# Main Makefile for SExtractor
-# Copyright (C) 2002-2009 Emmanuel Bertin.
 AUTOMAKE_OPTIONS = foreign no-dependencies
 SUBDIRS = man src tests
-dist_pkgdata_DATA = xsl/sextractor.xsl
-EXTRA_DIST = config doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY \
-			  INSTALL README THANKS \
+dist_pkgdata_DATA = config/* xsl/sextractor.xsl
+EXTRA_DIST = doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY \
+			  INSTALL LICENSE README THANKS \
 			  acx_atlas.m4 acx_prog_cc_optim.m4 \
 			  acx_urbi_resolve_dir.m4
 

README

 SExtractor stands for ``Source Extractor'': a software for making
 catalog of sources from astronomical images.
-Multi-Extension FITS is now supported. Binary output catalogs are also MEFs.
-ASCII output catalogs contain detections from all extensions merged together.
-Use the "EXT_NUMBER" catalog parameter to identify the extension on which a
-given source was detected. Check-images will also be written as MEFs if the
-input image is a MEF.
-- The (main) default config file can be dumped by typing "sex -d". Secondary
-configuration files like default.param are still needed, though.
-
-The SExtractor homepage is
-http://astromatic.net/software/sextractor
+The SExtractor homepage is http://astromatic.net/software/sextractor
 In case of problems, questions or suggestions related to the software, please
 refer to the SExtractor forum:
-http://astromatic.net/forum/forumdisplay.php?fid=4
+http://astromatic.net/forum
 
-					Emmanuel Bertin.
+					Emmanuel Bertin <bertin@iap.fr>.
 

THANKS

-Stephane Arnouts <Stephane.Arnouts@oamp.fr>
+Stéphane Arnouts <Stephane.Arnouts@oamp.fr>
 	Suggestions and extensive testing
+Marta Arroyo <marta.arroyo@alumnos.unican.es>
+	For her preparatory work on galaxy model-fitting
 Pierre Astier <pierre.astier@in2p3.fr>
 	Suggestions and bug fixes
 Eric Aubourg <Eric.Aubourg@cea.fr>
 	Hints about how to optimize a C code
 Anthony Baillard <baillard@iap.fr>
 	Testing of model-fitting
+Gary Bernstein <garyb@physics.upenn.edu>
+	Helping with error estimates
 Mark Calabretta <mcalabre@atnf.csiro.au>
-	SExtractor makes use of his nice WCS library
-Pascal Fouque <pfouque@eso.org>
+	SExtractor uses an early version of his great WCS library
+Philippe Delorme <pdelorme@obs.ujf-grenoble.fr>
+	Debugging and improving PSF-fitting
+Akim Demaille <akim@lrde.epita.fr>
+	for solving the $datarootdir issue and providing the URBI_RESOLVE_DIR()
+	function.
+Shantanu Desai <shantanu@astro.illinois.edu>
+	Finding well-hidden bugs.
+Pascal Fouqué <pfouque@eso.org>
 	Suggestions and testing
+Raphaël Gavazzi <gavazzi@iap.fr>
+	Checking shape measurements
 Delphine Hardin <hardin@in2p3.fr>
 	Suggestions and bug fixes
 Benne Holwerda <holwerda@stsci.edu>
 	For making his cookbook available
 Jean-Paul Kneib <kneib@omp.fr>, Ian Smail <Ian.Smail@durham.ac.uk>
 	Suggestions and spreading the software back in the early days! 
+Jan Kohnert <jan.kohnert@nexgo.de>
+	Helping SExtractor users
 Ville Laurikari	<vl@iki.fi>
 	For his VL_PROG_CC_WARNINGS (modified to ACX_PROG_CC_OPTIM)
-Valerie de Lapparent <lapparen@iap.fr>
+Valérie de Lapparent <lapparen@iap.fr>
 	Suggestions and testing of model-fitting
+Manolis Lourakis <lourakis@ics.forth.gr>
+	For his implementation of the Levenberg-Marquardt algorithm
 Chiara Marmo <marmo@iap.fr>
 	For providing the VOTable to HTML XSLT filter and testing.
 Joe Mohr <jmohr@illinois.edu>
 	Suggestions and testing
-Gerard Tissier <tissier@iap.fr>
+Sergio Pascual <sergiopr@astrax.fis.ucm.es>
+	Helping with autoconfig and packaging
+Nacho Sevilla <nsevilla@gmail.com>
+	Testing star/galaxy classification
+Víctor Terrón <vterron@iaa.es>
+	Suggesting and documenting DETECT_MAXAREA
+Patrick Tisserand <tisseran@mso.anu.edu.au>
+	Testing PSF-fitting
+Gérard Tissier <tissier@iap.fr>
 	Preliminary implementation of the VOTable output
-Joachim Wuttke <J.Wuttke@fz-juelich.de>
-	For his implementation of the Levenberg-Marquardt algorithm
 
 Institut d'Astrophysique de Paris
-University of Leiden
+DeNIS project
 European Southern Observatory
+Sterrewacht Leiden
+TERAPIX project
+French Ministry of Research Grant 04-5500 (“ACI masse de donn´ees”)
 University of Illinois
+Dark Energy Survey data management project
 	Financial and technical support
 
 Too many people to list

acx_atlas.m4

-dnl @synopsis ACX_ATLAS([ATLAS_LIBDIR, ATLAS_INCDIR, ATLAS_PFLAG, [ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])
-dnl This macro figures out if the ATLAS library and header files
-dnl are installed.
+dnl
+dnl				acx_atlas.m4
+dnl
+dnl Figure out if the ATLAS library and header files are installed.
+dnl
+dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dnl
+dnl	This file part of:	AstrOmatic software
+dnl
+dnl	Copyright:		(C) 2003-2010 IAP/CNRS/UPMC
+dnl
+dnl	Author:			Emmanuel Bertin (IAP)
+dnl
+dnl	License:		GNU General Public License
+dnl
+dnl	AstrOmatic software is free software: you can redistribute it and/or
+dnl	modify it under the terms of the GNU General Public License as
+dnl	published by the Free Software Foundation, either version 3 of the
+dnl	License, or (at your option) any later version.
+dnl	AstrOmatic software is distributed in the hope that it will be useful,
+dnl	but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl	GNU General Public License for more details.
+dnl	You should have received a copy of the GNU General Public License
+dnl	along with AstrOmatic software.
+dnl	If not, see <http://www.gnu.org/licenses/>.
+dnl
+dnl	Last modified:		10/10/2010
+dnl
+dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dnl
+dnl @synopsis ACX_ATLAS([ATLAS_LIBDIR, ATLAS_INCDIR, ATLAS_PFLAG,
+dnl                     [ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])
 dnl You may wish to use these variables in your default LIBS:
 dnl
 dnl        LIBS="$ATLAS_LIBS $LIBS"
@@ -8,9 +38,6 @@ dnl
 dnl ACTION-IF-FOUND is a list of shell commands to run if BLAS/LAPACK
 dnl is found (HAVE_ATLAS is defined first), and ACTION-IF-NOT-FOUND
 dnl is a list of commands to run it if it is not found.
-dnl
-dnl @version $Id: acx_atlas.m4,v 1.0 2009/06/26 14:30:17 bertin Exp $
-dnl @author Emmanuel Bertin <bertin@iap.fr>
 
 AC_DEFUN([ACX_ATLAS], [
 AC_REQUIRE([AC_CANONICAL_HOST])

acx_fftw.m4

-dnl @synopsis ACX_FFTW([FFTW_DIR, FFTW_INCDIR, FFTW_PFLAG, FFTW_FFLAG, [ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])
+dnl
+dnl				acx_fftw.m4
+dnl
+dnl Figure out if the FFTW3 library and header files are installed.
+dnl
+dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dnl
+dnl	This file part of:	AstrOmatic software
+dnl
+dnl	Copyright:		(C) 2003-2010 IAP/CNRS/UPMC
+dnl
+dnl	Author:			Emmanuel Bertin (IAP)
+dnl
+dnl	License:		GNU General Public License
+dnl
+dnl	AstrOmatic software is free software: you can redistribute it and/or
+dnl	modify it under the terms of the GNU General Public License as
+dnl	published by the Free Software Foundation, either version 3 of the
+dnl	License, or (at your option) any later version.
+dnl	AstrOmatic software is distributed in the hope that it will be useful,
+dnl	but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl	GNU General Public License for more details.
+dnl	You should have received a copy of the GNU General Public License
+dnl	along with AstrOmatic software.
+dnl	If not, see <http://www.gnu.org/licenses/>.
+dnl
+dnl	Last modified:		10/10/2010
+dnl
+dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dnl
+dnl @synopsis ACX_FFTW([FFTW_DIR, FFTW_INCDIR, FFTW_PFLAG, FFTW_FFLAG,
+dnl                    [ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])
 dnl This macro figures out if the FFTW3 libraries and header
 dnl files are installed.
 dnl You may wish to use these variables in your default LIBS and CFLAGS:
@@ -8,9 +40,6 @@ dnl
 dnl ACTION-IF-FOUND is a list of shell commands to run if FFTW
 dnl is found (HAVE_FFTWx are defined first), and ACTION-IF-NOT-FOUND
 dnl is a list of commands to run it if it is not found.
-dnl
-dnl @version $Id: acx_fftw.m4,v 1.0 2009/06/26 21:30:17 bertin Exp $
-dnl @author Emmanuel Bertin <bertin@iap.fr>
 
 AC_DEFUN([ACX_FFTW], [
 AC_REQUIRE([AC_CANONICAL_HOST])

acx_prog_cc_optim.m4

-dnl @synopsis ACX_PROG_CC_OPTIM
 dnl
-dnl Enables a reasonable set of optimization flags for the C compiler. 
+dnl				acx_prog_cc_optim.m4
+dnl
+dnl Enable a reasonable set of optimization flags for the C compiler. 
+dnl
+dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dnl
+dnl	This file part of:	AstrOmatic software
+dnl
+dnl	Copyright:		(C) 2002-2010 IAP/CNRS/UPMC (this version)
+dnl				(C) 2002 Ville Lauriki (original version)
+dnl
+dnl	Authors:		Emmanuel Bertin (IAP)
+dnl				Ville Lauriki (original VL_PROG_CC_WARNINGS)
+dnl
+dnl	Licenses:		GPL (this version)
+dnl				MIT AllPermissive (original script)
+dnl
+dnl	AstrOmatic software is free software: you can redistribute it and/or
+dnl	modify it under the terms of the GNU General Public License as
+dnl	published by the Free Software Foundation, either version 3 of the
+dnl	License, or (at your option) any later version.
+dnl	AstrOmatic software is distributed in the hope that it will be useful,
+dnl	but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl	GNU General Public License for more details.
+dnl	You should have received a copy of the GNU General Public License
+dnl	along with AstrOmatic software.
+dnl	If not, see <http://www.gnu.org/licenses/>.
+dnl
+dnl	Last modified:		09/10/2010
+dnl
+dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dnl
+dnl @synopsis ACX_PROG_CC_OPTIM
 dnl
 dnl Currently this macro knows about GCC, Solaris C compiler,
 dnl Digital Unix C compiler, C for AIX Compiler, HP-UX C compiler,
@@ -8,9 +40,8 @@ dnl IRIX C compiler, NEC SX-5 (Super-UX 10) C compiler, and Cray J90
 dnl (Unicos 10.0.0.8) C compiler.
 dnl
 dnl This macro is a modification of Ville Laurikari's VL_PROG_CC_WARNINGS
-dnl @version 1.4 (2009-09-08)
-dnl @authors Emmanuel Bertin <bertin@iap.fr> Ville Laurikari <vl@iki.fi>
 dnl
+
 AC_DEFUN([ACX_PROG_CC_OPTIM], [
   msg="for C compiler optimization flags"
   AC_CACHE_CHECK($msg, prog_cc_optim_cv_flags, [

acx_urbi_resolve_dir.m4

-
+dnl
+dnl				acx_urbi_resolve_dir.m4
+dnl
+dnl Enable a reasonable set of optimization flags for the C compiler. 
+dnl
+dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dnl
+dnl	This file part of:	AstrOmatic software
+dnl
+dnl	Copyright:		(C) 2007-2010 IAP/CNRS/UPMC (this version)
+dnl				(C) 2007 Akim Demaille (original version)
+dnl
+dnl	Authors:		Emmanuel Bertin (IAP)
+dnl				Akim Demaille (original script)
+dnl
+dnl	License:		GPL
+dnl
+dnl	AstrOmatic software is free software: you can redistribute it and/or
+dnl	modify it under the terms of the GNU General Public License as
+dnl	published by the Free Software Foundation, either version 3 of the
+dnl	License, or (at your option) any later version.
+dnl	AstrOmatic software is distributed in the hope that it will be useful,
+dnl	but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl	GNU General Public License for more details.
+dnl	You should have received a copy of the GNU General Public License
+dnl	along with AstrOmatic software.
+dnl	If not, see <http://www.gnu.org/licenses/>.
+dnl
+dnl	Last modified:		09/10/2010
+dnl
+dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dnl
+dnl @synopsis ACX_URBI_RESOLVE_DIR
+dnl
+dnl Return a directory with all inner variables expanded.
+dnl Based on a macro kindly provided by Akim Demaille  <akim@lrde.epita.fr>.
 
 # URBI_RESOLVE_DIR_PREPARE
 # ------------------------
@@ -6,7 +42,7 @@
 m4_defun([URBI_RESOLVE_DIR_PREPARE],
 [# PATH urbi_resolve_dir(DIR)
 # --------------------------
-# Return the DIR with all inner variables expanded.
+# 
 urbi_resolve_dir ()
 {
   ac_$0_dir=$[]1

config/default.sex

-# Default configuration file for SExtractor 2.5.0
-# EB 2006-07-14
+# Default configuration file for SExtractor 2.12.4
+# EB 2010-10-10
 #
  
 #-------------------------------- Catalog ------------------------------------
@@ -12,7 +12,8 @@ PARAMETERS_NAME  default.param  # name of the file containing catalog contents
 #------------------------------- Extraction ----------------------------------
  
 DETECT_TYPE      CCD            # CCD (linear) or PHOTO (with gamma correction)
-DETECT_MINAREA   5              # minimum number of pixels above threshold
+DETECT_MINAREA   3              # min. # of pixels above threshold
+
 DETECT_THRESH    1.5            # <sigmas> or <threshold>,<ZP> in mag.arcsec-2
 ANALYSIS_THRESH  1.5            # <sigmas> or <threshold>,<ZP> in mag.arcsec-2
  
@@ -25,21 +26,34 @@ DEBLEND_MINCONT  0.005          # Minimum contrast parameter for deblending
 CLEAN            Y              # Clean spurious detections? (Y or N)?
 CLEAN_PARAM      1.0            # Cleaning efficiency
  
-MASK_TYPE        CORRECT        # type of detection MASKing: can be one of
-                                # NONE, BLANK or CORRECT
- 
+#-------------------------------- WEIGHTing ----------------------------------
+
+WEIGHT_TYPE      NONE           # type of WEIGHTing: NONE, BACKGROUND,
+                                # MAP_RMS, MAP_VAR or MAP_WEIGHT
+WEIGHT_IMAGE     weight.fits    # weight-map filename
+
+#-------------------------------- FLAGging -----------------------------------
+
+FLAG_IMAGE       flag.fits      # filename for an input FLAG-image
+FLAG_TYPE        OR             # flag pixel combination: OR, AND, MIN, MAX
+                                # or MOST
+
 #------------------------------ Photometry -----------------------------------
  
 PHOT_APERTURES   5              # MAG_APER aperture diameter(s) in pixels
 PHOT_AUTOPARAMS  2.5, 3.5       # MAG_AUTO parameters: <Kron_fact>,<min_radius>
 PHOT_PETROPARAMS 2.0, 3.5       # MAG_PETRO parameters: <Petrosian_fact>,
                                 # <min_radius>
- 
+PHOT_AUTOAPERS   0.0,0.0        # <estimation>,<measurement> minimum apertures
+                                # for MAG_AUTO and MAG_PETRO
+
 SATUR_LEVEL      50000.0        # level (in ADUs) at which arises saturation
+SATUR_KEY        SATURATE       # keyword for saturation level (in ADUs)
  
 MAG_ZEROPOINT    0.0            # magnitude zero-point
 MAG_GAMMA        4.0            # gamma of emulsion (for photographic scans)
 GAIN             0.0            # detector gain in e-/ADU
+GAIN_KEY         GAIN           # keyword for detector gain in e-/ADU
 PIXEL_SCALE      1.0            # size of pixel in arcsec (0=use FITS WCS info)
  
 #------------------------- Star/Galaxy Separation ----------------------------
@@ -49,11 +63,11 @@ STARNNW_NAME     default.nnw    # Neural-Network_Weight table filename
  
 #------------------------------ Background -----------------------------------
  
+BACK_TYPE        AUTO           # AUTO or MANUAL
+BACK_VALUE       0.0            # Default background value in MANUAL mode
 BACK_SIZE        64             # Background mesh: <size> or <width>,<height>
 BACK_FILTERSIZE  3              # Background filter: <size> or <width>,<height>
  
-BACKPHOTO_TYPE   GLOBAL         # can be GLOBAL or LOCAL
- 
 #------------------------------ Check Image ----------------------------------
  
 CHECKIMAGE_TYPE  NONE           # can be NONE, BACKGROUND, BACKGROUND_RMS,
@@ -68,8 +82,22 @@ MEMORY_OBJSTACK  3000           # number of objects in stack
 MEMORY_PIXSTACK  300000         # number of pixels in stack
 MEMORY_BUFSIZE   1024           # number of lines in buffer
  
+#------------------------------- ASSOCiation ---------------------------------
+
+ASSOC_NAME       sky.list       # name of the ASCII file to ASSOCiate
+ASSOC_DATA       2,3,4          # columns of the data to replicate (0=all)
+ASSOC_PARAMS     2,3,4          # columns of xpos,ypos[,mag]
+ASSOC_RADIUS     2.0            # cross-matching radius (pixels)
+ASSOC_TYPE       NEAREST        # ASSOCiation method: FIRST, NEAREST, MEAN,
+                                # MAG_MEAN, SUM, MAG_SUM, MIN or MAX
+ASSOCSELEC_TYPE  MATCHED        # ASSOC selection type: ALL, MATCHED or -MATCHED
+
 #----------------------------- Miscellaneous ---------------------------------
  
 VERBOSE_TYPE     NORMAL         # can be QUIET, NORMAL or FULL
+HEADER_SUFFIX    .head          # Filename extension for additional headers
 WRITE_XML        N              # Write XML file (Y/N)?
 XML_NAME         sex.xml        # Filename for XML output
+XSL_URL          file:///usr/local/share/sextractor/sextractor.xsl
+                                # Filename for XSL style-sheet
+

configure

 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for sextractor 2.12.3.
+# Generated by GNU Autoconf 2.63 for sextractor 2.13.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.12.3'
-PACKAGE_STRING='sextractor 2.12.3'
+PACKAGE_VERSION='2.13.0'
+PACKAGE_STRING='sextractor 2.13.0'
 PACKAGE_BUGREPORT='bertin@iap.fr'
 ac_unique_file="src/makeit.c"
@@ -1508,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.12.3 to adapt to many kinds of systems.
+\`configure' configures sextractor 2.13.0 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1578,7 +1578,7 @@ fi
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sextractor 2.12.3:";;
+     short | recursive ) echo "Configuration of sextractor 2.13.0:";;
    esac
   cat <<\_ACEOF
@@ -1711,7 +1711,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sextractor configure 2.12.3
+sextractor configure 2.13.0
 generated by GNU Autoconf 2.63
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1725,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.12.3, which was
+It was created by sextractor $as_me 2.13.0, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
   $ $0 $@
@@ -2428,7 +2428,7 @@ fi
 # Define the identity of the package.
  PACKAGE='sextractor'
- VERSION='2.12.3'
+ VERSION='2.13.0'
 cat >>confdefs.h <<_ACEOF
@@ -23273,7 +23273,7 @@ fi
 # Set the data directory to a true absolute path
 datadir2=$(# PATH urbi_resolve_dir(DIR)
 # --------------------------
-# Return the DIR with all inner variables expanded.
+#
 urbi_resolve_dir ()
 {
   ac_URBI_RESOLVE_DIR_PREPARE_dir=$1
@@ -28593,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.12.3, which was
+This file was extended by sextractor $as_me 2.13.0, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
   CONFIG_FILES    = $CONFIG_FILES
@@ -28656,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.12.3
+sextractor config.status 2.13.0
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

configure.ac

-# configure.in for SExtractor
-# (C) E.Bertin 2002-2010
-# Process this file with autoconf to produce a configure script.
+#
+#				configure.ac
+#
+# Process this file with autoconf to generate a configure script.
+#
+#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+#
+#	This file part of:	SExtractor
+#
+#	Copyright:		(C) 2002-2010 IAP/CNRS/UPMC
+#
+#	Author:			Emmanuel Bertin (IAP)
+#
+#	SExtractor is free software: you can redistribute it and/or modify
+#	it under the terms of the GNU General Public License as published by
+#	the Free Software Foundation, either version 3 of the License, or
+# 	(at your option) any later version.
+#	SExtractor is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#	GNU General Public License for more details.
+#	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:		11/10/2010
+#
+#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 # First, disable the annoying config.cache
 define([AC_CACHE_LOAD],)
 define([AC_CACHE_SAVE],)
 
 # This is your standard Bertin source code...
-AC_INIT(sextractor, 2.12.3, [bertin@iap.fr])
+AC_INIT(sextractor, 2.13.0, [bertin@iap.fr])
 AC_CONFIG_SRCDIR(src/makeit.c)
 AC_CONFIG_AUX_DIR(autoconf)
 AM_CONFIG_HEADER(config.h)

doc/README.DOC

-The present documentation of SExtractor2 is still very incomplete: this
+The present documentation of SExtractor is still very incomplete: this
 is rather a ``proto-documentation''. Chapters are missing. The english
-is so-so. At least I tried to remove any obsolete information from V1.0.
-I will progressively upgrade the documentation during the coming months.
-In the meanwhile, you may still retrieve some basic information from the
-old documentation included in V1.0 archive:
-ftp://ftp/pub/from_users/bertin/sextractor/sex_1.0a.tar.gz
-The SExtractor handbook from Benne Holwerda is also included for convenience.
+is so-so. We will progressively upgrade the documentation during 2011.
 
 					Emmanuel Bertin.

man/sex.1

-.TH SEXTRACTOR "1" "September 2010" "SWarp 2.12.3" "User Commands"
+.TH SEXTRACTOR "1" "October 2010" "SExtractor 2.13.0" "User Commands"
 .SH NAME
-sex \- extract a source catalog from an astronomical FITS image
+sex \- extract a source catalogue from an astronomical FITS image
 .SH SYNOPSIS
 .B sex \fIimage\fR [\fI-c configuration-file\fR]
 .RS
@@ -29,19 +29,26 @@ print version number, then exit
 .TP
 \fB\-d\fR, \fB\-\-dump\fR
 dump a default configuration file
-.SH AUTHOR
-Written by Emmanuel Bertin (Institut d'Astrophysique de Paris and Observatoire de Paris).
-.PP
-Copyright 1994-2005 Emmanuel Bertin
-.RE
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.SH "REPORTING BUGS"
-Report bugs to <sextractor@iap.fr>.
-.SH "SEE ALSO"
-.BR swarp (1)
-.PP
+.SH MANUAL
 The full documentation for
 .B SExtractor
 is maintained as a PDF manual available at
 .B http://astromatic.net/software/sextractor
+.SH "REPORTING BUGS"
+Please report bugs to the SExtractor software forum at
+http://astromatic.net/forum.
+.SH "SEE ALSO"
+.BR
+eye(1), missfits(1), psfex(1), scamp(1), sky(1), stiff(1), stuff(1), swarp (1),
+ww(1)
+.SH AUTHORS
+Written by Emmanuel Bertin (Institut d'Astrophysique de Paris)
+.PP
+.SH LICENSE
+SExtractor is licensed under the terms of the General Public License (GPL),
+version 3.
+.SH COPYRIGHT
+.PP
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+