Fixed issue with duplicated sources when PSF_NMAX is >1. (48d60ffa) · Commits · csst-pipeline / msc / sextractor

COPYRIGHT

+1 −1

Original line number	Diff line number	Diff line
		Copyright 1994-2010 IAP-CNRS / Universite P.&M.Curie
		Copyright 2010 IAP - CNRS / Universite P.&M.Curie

		Author: Emmanuel Bertin <bertin@iap.fr>

acx_pthread.m4

+34 −5

Original line number	Diff line number	Diff line
		dnl
		dnl acx_pthread.m4
		dnl
		dnl Figure out how to build C programs using POSIX threads
		dnl
		dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
		dnl
		dnl This file part of: AstrOmatic software
		dnl
		dnl Copyrights: (C) 2002-2010 IAP/CNRS/UPMC (this version)
		dnl (C) 2001 Steven G. Johnson (original version)
		dnl
		dnl Authors: Emmanuel Bertin (IAP)
		dnl Steven G. Johnson (original ACX_PTHREAD)
		dnl
		dnl Licenses: GPL (this version)
		dnl GPLWithACException (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_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
		dnl
		dnl This macro figures out how to build C programs using POSIX
		@@ -33,11 +67,6 @@ dnl based on work by SGJ on autoconf scripts for FFTW (www.fftw.org)
		dnl (with help from M. Frigo), as well as ac_pthread and hb_pthread
		dnl macros posted by AFC to the autoconf macro repository. We are also
		dnl grateful for the helpful feedback of numerous users.
		dnl
		dnl @version $Id: acx_pthread.m4,v 1.4 2001/03/16 08:40:17 simons Exp $
		dnl @author Steven G. Johnson <stevenj@alum.mit.edu> and Alejandro Forero Cuervo <bachue@bachue.com>
		dnl modified by E.Bertin <bertin@iap.fr> (ordering of flags and deactivated
		dnl pthread.h check) 2002/04/25

		AC_DEFUN([ACX_PTHREAD], [
		AC_REQUIRE([AC_CANONICAL_HOST])

configure

+10 −10

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.13.0.
		# Generated by GNU Autoconf 2.63 for sextractor 2.13.1.
		#
		# 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.13.0'
		PACKAGE_STRING='sextractor 2.13.0'
		PACKAGE_VERSION='2.13.1'
		PACKAGE_STRING='sextractor 2.13.1'
		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.13.0 to adapt to many kinds of systems.
		\`configure' configures sextractor 2.13.1 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.13.0:";;
		short \| recursive ) echo "Configuration of sextractor 2.13.1:";;
		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.13.0
		sextractor configure 2.13.1
		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.13.0, which was
		It was created by sextractor $as_me 2.13.1, 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.13.0'
		VERSION='2.13.1'


		cat >>confdefs.h <<_ACEOF
		@@ -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.13.0, which was
		This file was extended by sextractor $as_me 2.13.1, 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.13.0
		sextractor config.status 2.13.1
		configured by $0, generated by GNU Autoconf 2.63,
		with options \\"`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

configure.ac

+2 −2

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: 11/10/2010
		# Last modified: 14/10/2010
		#
		#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

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

		# This is your standard Bertin source code...
		AC_INIT(sextractor, 2.13.0, [bertin@iap.fr])
		AC_INIT(sextractor, 2.13.1, [bertin@iap.fr])
		AC_CONFIG_SRCDIR(src/makeit.c)
		AC_CONFIG_AUX_DIR(autoconf)
		AM_CONFIG_HEADER(config.h)

man/Makefile.am

+31 −2

Original line number	Diff line number	Diff line
		# Manpage Makefile for SExtractor
		# Copyright (C) 2002 Emmanuel Bertin.
		#
		# Makefile.am
		#
		# Man 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: 12/10/2010
		#
		#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

		dist_man_MANS = sex.1 sex.x