Removed unstable and buggy measurements from parameter list.

Cleaned up Makefile.am RPM options.
Fixed rpm build issue on Fedora Core 10.
Fixed display of max thread number in configure help.
Updated icc compilation flags to 11.0 syntax.
Set the license string to CeCILL in the .spec file.
Pushed version number to 2.8.5.

Makefile.am

@@ -20,49 +20,3 @@ rpm-icc:	dist
 	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
 	USE_ICC="1" rpmbuild -ba --clean --nodeps $(PACKAGE_NAME).spec
 
-rpm-opteron:	dist
-	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-	TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \
-		-march=opteron" \
-		TPXLDFLAGS="-static -shared-libgcc" \
-		TPXLIBS="-lfftw3 -llapack -lcblas -latlas -lm" \
-		rpmbuild -ba --target=x86_64 --clean $(PACKAGE_NAME).spec
-
-rpm-athlon:	dist
-	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-	TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \
-		-m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" \
-		TPXLDFLAGS="-static -shared-libgcc" \
-		TPXLIBS="-L/usr/lib/ -lm -L/usr/local/lib/ -lfftw3 \
-		-llapack -lcblas -latlas -lm" \
-		rpmbuild -ba --target=i686 --clean $(PACKAGE_NAME).spec
-
-rpm-opteron-icc:	dist
-	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-	TPXCC="icc" TPXFLAGS="-O3 -g -axWPT -ip -unroll" \
-		TPXLDFLAGS="-static -shared-libgcc" \
-		TPXLIBS="-lfftw3 -llapack -lcblas -latlas -lm" \
-		rpmbuild -ba --target=x86_64 --clean --nodeps $(PACKAGE_NAME).spec
-
-rpm-athlon-icc:	dist
-	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-		TPXCC="icc32" TPXFLAGS="-O3 -g -axKWNPT -ip -unroll" \
-		TPXLDFLAGS="-static -shared-libgcc" \
-		TPXLIBS="-L/usr/local/lib/ -L/usr/lib/ -lfftw3 \
-		-llapack -lcblas -latlas -lm" \
-		rpmbuild -ba --target=i686 --clean $(PACKAGE_NAME).spec
-
-athlon:
-	$(MAKE) CFLAGS="-O -g -pthread -funroll-loops -fomit-frame-pointer \
-		-Wall -m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" \
-		LIBS="-L/usr/lib/ -lpthread -lm -L/usr/local/lib/ \
-		-lfftw3 -lfftw3_threads \
-		-llapack -lcblas -latlas -lm"
-
-pentium-icc:
-	$(MAKE) CC="icc32" CFLAGS="-O3 -axKWNPT -ip -unroll -pthread" \
-		LIBS="-L/usr/lib/ -lpthread -lm -L/usr/local/lib/ -llapack \
-		-lcblas -latlas -lfftw3 -lfftw3_threads"
-
-icc:
-	$(MAKE) CC="icc" CFLAGS="-O3 -g -axWPT -ip -unroll -pthread"

Makefile.in

@@ -114,6 +114,7 @@ DATE2 = @DATE2@
 DATE3 = @DATE3@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -138,6 +139,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGER = @PACKAGER@
@@ -205,6 +207,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
@@ -705,53 +708,6 @@ rpm:	dist
 rpm-icc:	dist
 	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
 	USE_ICC="1" rpmbuild -ba --clean --nodeps $(PACKAGE_NAME).spec
-
-rpm-opteron:	dist
-	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-	TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \
-		-march=opteron" \
-		TPXLDFLAGS="-static -shared-libgcc" \
-		TPXLIBS="-lfftw3 -llapack -lcblas -latlas -lm" \
-		rpmbuild -ba --target=x86_64 --clean $(PACKAGE_NAME).spec
-
-rpm-athlon:	dist
-	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-	TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \
-		-m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" \
-		TPXLDFLAGS="-static -shared-libgcc" \
-		TPXLIBS="-L/usr/lib/ -lm -L/usr/local/lib/ -lfftw3 \
-		-llapack -lcblas -latlas -lm" \
-		rpmbuild -ba --target=i686 --clean $(PACKAGE_NAME).spec
-
-rpm-opteron-icc:	dist
-	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-	TPXCC="icc" TPXFLAGS="-O3 -g -axWPT -ip -unroll" \
-		TPXLDFLAGS="-static -shared-libgcc" \
-		TPXLIBS="-lfftw3 -llapack -lcblas -latlas -lm" \
-		rpmbuild -ba --target=x86_64 --clean --nodeps $(PACKAGE_NAME).spec
-
-rpm-athlon-icc:	dist
-	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
-		TPXCC="icc32" TPXFLAGS="-O3 -g -axKWNPT -ip -unroll" \
-		TPXLDFLAGS="-static -shared-libgcc" \
-		TPXLIBS="-L/usr/local/lib/ -L/usr/lib/ -lfftw3 \
-		-llapack -lcblas -latlas -lm" \
-		rpmbuild -ba --target=i686 --clean $(PACKAGE_NAME).spec
-
-athlon:
-	$(MAKE) CFLAGS="-O -g -pthread -funroll-loops -fomit-frame-pointer \
-		-Wall -m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" \
-		LIBS="-L/usr/lib/ -lpthread -lm -L/usr/local/lib/ \
-		-lfftw3 -lfftw3_threads \
-		-llapack -lcblas -latlas -lm"
-
-pentium-icc:
-	$(MAKE) CC="icc32" CFLAGS="-O3 -axKWNPT -ip -unroll -pthread" \
-		LIBS="-L/usr/lib/ -lpthread -lm -L/usr/local/lib/ -llapack \
-		-lcblas -latlas -lfftw3 -lfftw3_threads"
-
-icc:
-	$(MAKE) CC="icc" CFLAGS="-O3 -g -axWPT -ip -unroll -pthread"
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

acx_prog_cc_optim.m4

@@ -8,7 +8,7 @@ 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.2 (2008-10-01)
+dnl @version 1.3 (2009-03-23)
 dnl @authors Emmanuel Bertin <bertin@iap.fr> Ville Laurikari <vl@iki.fi>
 dnl
 AC_DEFUN([ACX_PROG_CC_OPTIM], [
@@ -32,14 +32,14 @@ EOF
       if $CC -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1 &&
            $CC -c -O conftest.c > /dev/null 2>&1 &&
            test -f conftest.o; then
-        prog_cc_optim_flags="-O3 -axWPTS -ip -no-prec-div -unroll"
+        prog_cc_optim_flags="-O3 -axSSE2,SSE3,SSE4.1,SSE4.2 -ip -no-prec-div -unroll"
         prog_ld_optim_flags="-static-intel"
 
       dnl INTEL C 32bits compiler
       elif $CC -V 2>&1 | grep -i "Intel(R)" > /dev/null 2>&1 &&
            $CC -c -O conftest.c > /dev/null 2>&1 &&
            test -f conftest.o; then
-        prog_cc_optim_flags="-O -axKWNPTS -ip -no-prec-div"
+        prog_cc_optim_flags="-O3 -axSSE2,SSE3,SSE4.1,SSE4.2 -ip -no-prec-div -unroll"
         prog_ld_optim_flags="-static-intel"
 
       dnl GCC

configure.ac

@@ -6,7 +6,7 @@ define([AC_CACHE_LOAD],)
 define([AC_CACHE_SAVE],)
 
 # This is your standard Bertin source code...
-AC_INIT(sextractor, 2.8.4, [bertin@iap.fr])
+AC_INIT(sextractor, 2.8.5, [bertin@iap.fr])
 AC_CONFIG_SRCDIR(src/makeit.c)
 AC_CONFIG_AUX_DIR(autoconf)
 AM_CONFIG_HEADER(config.h)
@@ -137,7 +137,7 @@ AC_DEFINE_UNQUOTED([XSL_URL], "$xsl_url",[Default URL of the XSLT filter])
 n_pthreads=16
 AC_ARG_ENABLE(threads,
         [AC_HELP_STRING([--enable-threads@<:@=<max_number_of_threads>@:>@],
-	[Enable multhreading (on with up to $n_pthreads threads by default)])],
+	[Enable multhreading (on with up to 16 threads by default)])],
     if test "$enableval" = "no"; then
       use_pthreads="no"
     else

man/Makefile.in

@@ -78,6 +78,7 @@ DATE2 = @DATE2@
 DATE3 = @DATE3@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -102,6 +103,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGER = @PACKAGER@
@@ -169,6 +171,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 

man/sex.1

-.TH SEXTRACTOR "1" "March 2009" "SWarp 2.8.4" "User Commands"
+.TH SEXTRACTOR "1" "March 2009" "SWarp 2.8.5" "User Commands"
 .SH NAME
 sex \- extract a source catalog from an astronomical FITS image
 .SH SYNOPSIS

sextractor.spec.in

 %define name @PACKAGE_NAME@
 %define version @PACKAGE_VERSION@
 %define release 1
+%undefine _missing_build_ids_terminate_build
 
 Summary: Extract catalogs of sources from astronomical images
 Name: %{name}

src/Makefile.in

@@ -121,6 +121,7 @@ DATE2 = @DATE2@
 DATE3 = @DATE3@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -145,6 +146,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGER = @PACKAGER@
@@ -212,6 +214,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 

src/fits/Makefile.in

@@ -97,6 +97,7 @@ DATE2 = @DATE2@
 DATE3 = @DATE3@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -121,6 +122,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGER = @PACKAGER@
@@ -188,6 +190,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 

src/levmar/Makefile.in

@@ -94,6 +94,7 @@ DATE2 = @DATE2@
 DATE3 = @DATE3@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -118,6 +119,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGER = @PACKAGER@
@@ -185,6 +187,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 

src/paramprofit.h

@@ -9,7 +9,7 @@
 *
 *	Contents:	Model-fitting parameter list for catalog data.
 *
-*	Last modify:	18/03/2009
+*	Last modify:	23/03/2009
 *
 *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 */
@@ -323,6 +323,7 @@
   {"DISK_PATTERN_SPIRAL", "Disk pattern spiral index",
 	&outobj2.prof_disk_patternspiral, H_FLOAT, T_FLOAT, "%12.4g", "",
 	"stat.fit.param;src.morph.param", ""},
+/*
   {"FLUX_BAR", "Bar total flux from fitting",
 	&outobj2.prof_bar_flux, H_FLOAT, T_FLOAT, "%12.g", "count",
 	"phot.count;stat.fit.param", "ct"},
@@ -416,7 +417,7 @@
   {"ARMS_POSANGERR", "RMS error on fitted spiral arm position angle",
 	&outobj2.prof_arms_posangerr, H_FLOAT, T_FLOAT, "%7.3f", "deg",
 	"stat.error;pos.bodyrc.long;src.morph;stat.fit.param", "deg"},
-/*
+
   {"ARMS_THETA_WORLD", "Pos. angle (CCW/world-x) of spiral arms",
 	&outobj2.prof_arms_thetaw, H_FLOAT, T_FLOAT, "%+7.3f", "deg",
 	"pos.posAng;src.morph;stat.fit.param", "deg"},
@@ -429,7 +430,6 @@
   {"ARMS_THETA_B1950", "Pos. angle (east of north, B1950) of spiral arms",
 	&outobj2.prof_arms_theta1950, H_FLOAT, T_FLOAT, "%+7.3f", "deg",
 	"pos.posAng;src.morph;stat.fit.param", "deg"},
-*/
   {"ARMS_PITCH", "Pitch angle of spiral arms from fitting",
 	&outobj2.prof_arms_pitch, H_FLOAT, T_FLOAT, "%+7.3f", "deg",
 	"pos.posAng;src.morph;stat.fit.param;instr.det", "deg"},
@@ -454,3 +454,4 @@
   {"ARMS_QUADFRACERR", "RMS error on fitted spiral arms quadrature fraction",
 	&outobj2.prof_arms_quadfracerr, H_FLOAT, T_FLOAT, "%6.4f", "deg",
 	"stat.error;phot.count;arith.ratio;src.morph;stat.fit.param", "deg"},
+*/

src/wcs/Makefile.in

@@ -95,6 +95,7 @@ DATE2 = @DATE2@
 DATE3 = @DATE3@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -119,6 +120,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGER = @PACKAGER@
@@ -186,6 +188,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 

tests/Makefile.in

@@ -72,6 +72,7 @@ DATE2 = @DATE2@
 DATE3 = @DATE3@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -96,6 +97,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGER = @PACKAGER@
@@ -163,6 +165,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@