Fixed issue with FFTW configure for custom library paths. (8888bb8d) · Commits · csst-pipeline / msc / sextractor

acx_fftw.m4

+4 −4

configure

+15 −15

Original line number	Original line	Diff line number	Diff line
	#! /bin/sh		#! /bin/sh
	# Guess values for system-dependent variables and create Makefiles.		# Guess values for system-dependent variables and create Makefiles.
	# Generated by GNU Autoconf 2.63 for sextractor 2.9.8.		# Generated by GNU Autoconf 2.63 for sextractor 2.9.9.
	#		#
	# Report bugs to <bertin@iap.fr>.		# Report bugs to <bertin@iap.fr>.
	#		#
	@@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
	# Identity of this package.		# Identity of this package.
	PACKAGE_NAME='sextractor'		PACKAGE_NAME='sextractor'
	PACKAGE_TARNAME='sextractor'		PACKAGE_TARNAME='sextractor'
	PACKAGE_VERSION='2.9.8'		PACKAGE_VERSION='2.9.9'
	PACKAGE_STRING='sextractor 2.9.8'		PACKAGE_STRING='sextractor 2.9.9'
	PACKAGE_BUGREPORT='bertin@iap.fr'		PACKAGE_BUGREPORT='bertin@iap.fr'

	ac_unique_file="src/makeit.c"		ac_unique_file="src/makeit.c"
	@@ -1505,7 +1505,7 @@ if test "$ac_init_help" = "long"; then
	# Omit some internal or obsolete options to make the list less imposing.		# 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.		# This message is too long to be a string in the A/UX 3.1 sh.
	cat <<_ACEOF		cat <<_ACEOF
	\`configure' configures sextractor 2.9.8 to adapt to many kinds of systems.		\`configure' configures sextractor 2.9.9 to adapt to many kinds of systems.

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

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

	if test -n "$ac_init_help"; then		if test -n "$ac_init_help"; then
	case $ac_init_help in		case $ac_init_help in
	short \| recursive ) echo "Configuration of sextractor 2.9.8:";;		short \| recursive ) echo "Configuration of sextractor 2.9.9:";;
	esac		esac
	cat <<\_ACEOF		cat <<\_ACEOF

	@@ -1706,7 +1706,7 @@ fi
	test -n "$ac_init_help" && exit $ac_status		test -n "$ac_init_help" && exit $ac_status
	if $ac_init_version; then		if $ac_init_version; then
	cat <<\_ACEOF		cat <<\_ACEOF
	sextractor configure 2.9.8		sextractor configure 2.9.9
	generated by GNU Autoconf 2.63		generated by GNU Autoconf 2.63

	Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,		Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
	@@ -1720,7 +1720,7 @@ cat >config.log <<_ACEOF
	This file contains any messages produced by compilers while		This file contains any messages produced by compilers while
	running configure, to aid debugging if configure makes a mistake.		running configure, to aid debugging if configure makes a mistake.

	It was created by sextractor $as_me 2.9.8, which was		It was created by sextractor $as_me 2.9.9, which was
	generated by GNU Autoconf 2.63. Invocation command line was		generated by GNU Autoconf 2.63. Invocation command line was

	$ $0 $@		$ $0 $@
	@@ -2423,7 +2423,7 @@ fi

	# Define the identity of the package.		# Define the identity of the package.
	PACKAGE='sextractor'		PACKAGE='sextractor'
	VERSION='2.9.8'		VERSION='2.9.9'


	cat >>confdefs.h <<_ACEOF		cat >>confdefs.h <<_ACEOF
	@@ -20934,7 +20934,7 @@ fi

	done		done

	if test $enable_icc = "yes" -a $CC = "icc"; then		if test "$enable_icc" = "yes" -a "$CC" = "icc"; then

	for ac_header in mathimf.h		for ac_header in mathimf.h
	do		do
	@@ -24140,7 +24140,7 @@ fi
	if test x$acx_fftw_ok = xyes; then		if test x$acx_fftw_ok = xyes; then

	cat >>confdefs.h <<\_ACEOF		cat >>confdefs.h <<\_ACEOF
	#define FFTW_H "fftw.h"		#define FFTW_H "fftw3.h"
	_ACEOF		_ACEOF

	else		else
	@@ -24439,7 +24439,7 @@ fi
	if test x$acx_fftw_ok = xyes; then		if test x$acx_fftw_ok = xyes; then

	cat >>confdefs.h <<\_ACEOF		cat >>confdefs.h <<\_ACEOF
	#define FFTW_H "$fftw_libdir/include/fftw3.h"		#define FFTW_H $fftw_libdir"/include/fftw3.h
	_ACEOF		_ACEOF

	else		else
	@@ -24583,7 +24583,7 @@ fi
	if test x$acx_fftw_ok = xyes; then		if test x$acx_fftw_ok = xyes; then

	cat >>confdefs.h <<\_ACEOF		cat >>confdefs.h <<\_ACEOF
	#define FFTW_H "fftw.h"		#define FFTW_H "fftw3.h"
	_ACEOF		_ACEOF

	else		else
	@@ -24738,7 +24738,7 @@ fi

	if test x$acx_fftw_ok = xyes; then		if test x$acx_fftw_ok = xyes; then

	cat >>confdefs.h <<\_ACEOF		cat >>confdefs.h <<_ACEOF
	#define FFTW_H "$fftw_incdir/fftw3.h"		#define FFTW_H "$fftw_incdir/fftw3.h"
	_ACEOF		_ACEOF

	@@ -28535,7 +28535,7 @@ exec 6>&1
	# report actual input values of CONFIG_FILES etc. instead of their		# report actual input values of CONFIG_FILES etc. instead of their
	# values after options handling.		# values after options handling.
	ac_log="		ac_log="
	This file was extended by sextractor $as_me 2.9.8, which was		This file was extended by sextractor $as_me 2.9.9, which was
	generated by GNU Autoconf 2.63. Invocation command line was		generated by GNU Autoconf 2.63. Invocation command line was

	CONFIG_FILES = $CONFIG_FILES		CONFIG_FILES = $CONFIG_FILES
	@@ -28598,7 +28598,7 @@ Report bugs to <bug-autoconf@gnu.org>."
	_ACEOF		_ACEOF
	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1		cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
	ac_cs_version="\\		ac_cs_version="\\
	sextractor config.status 2.9.8		sextractor config.status 2.9.9
	configured by $0, generated by GNU Autoconf 2.63,		configured by $0, generated by GNU Autoconf 2.63,
	with options \\"`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"		with options \\"`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

configure.ac

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@ define([AC_CACHE_LOAD],)
	define([AC_CACHE_SAVE],)		define([AC_CACHE_SAVE],)

	# This is your standard Bertin source code...		# This is your standard Bertin source code...
	AC_INIT(sextractor, 2.9.8, [bertin@iap.fr])		AC_INIT(sextractor, 2.9.9, [bertin@iap.fr])
	AC_CONFIG_SRCDIR(src/makeit.c)		AC_CONFIG_SRCDIR(src/makeit.c)
	AC_CONFIG_AUX_DIR(autoconf)		AC_CONFIG_AUX_DIR(autoconf)
	AM_CONFIG_HEADER(config.h)		AM_CONFIG_HEADER(config.h)
	@@ -74,7 +74,7 @@ AC_CHECK_LIB(m, sin)
	AC_HEADER_STDC		AC_HEADER_STDC
	AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/mman.h \		AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/mman.h \
	sys/types.h unistd.h])		sys/types.h unistd.h])
	if test $enable_icc = "yes" -a $CC = "icc"; then		if test "$enable_icc" = "yes" -a "$CC" = "icc"; then
	AC_CHECK_HEADERS(mathimf.h)		AC_CHECK_HEADERS(mathimf.h)
	fi		fi

man/sex.1

+1 −1

Original line number	Original line	Diff line number	Diff line
	.TH SEXTRACTOR "1" "November 2009" "SWarp 2.9.8" "User Commands"		.TH SEXTRACTOR "1" "November 2009" "SWarp 2.9.9" "User Commands"
	.SH NAME		.SH NAME
	sex \- extract a source catalog from an astronomical FITS image		sex \- extract a source catalog from an astronomical FITS image
	.SH SYNOPSIS		.SH SYNOPSIS

src/fft.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@
	*		*
	* Contents: Routines dealing with float precision FFT.		* Contents: Routines dealing with float precision FFT.
	*		*
	* Last modify: 08/10/2009		* Last modify: 17/11/2009
	*		*
	*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%		*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
	*/		*/
	@@ -22,7 +22,7 @@
	#include <stdio.h>		#include <stdio.h>
	#include <stdlib.h>		#include <stdlib.h>

	#include <fftw3.h>		#include FFTW_H

	#include "define.h"		#include "define.h"
	#include "globals.h"		#include "globals.h"

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,7 @@ if test x$2 = x; then
	if test x$1 = x; then		if test x$1 = x; then
	AC_CHECK_HEADER(fftw3.h,[acx_fftw_ok=yes])		AC_CHECK_HEADER(fftw3.h,[acx_fftw_ok=yes])
	if test x$acx_fftw_ok = xyes; then		if test x$acx_fftw_ok = xyes; then
	AC_DEFINE(FFTW_H, "fftw.h", [FFTW header filename.])		AC_DEFINE(FFTW_H, "fftw3.h", [FFTW header filename.])
	else		else
	AC_CHECK_HEADER(fftw/fftw3.h,[acx_fftw_ok=yes])		AC_CHECK_HEADER(fftw/fftw3.h,[acx_fftw_ok=yes])
	if test x$acx_fftw_ok = xyes; then		if test x$acx_fftw_ok = xyes; then
	@@ -36,11 +36,11 @@ if test x$2 = x; then
	else		else
	AC_CHECK_HEADER($1/include/fftw3.h,[acx_fftw_ok=yes])		AC_CHECK_HEADER($1/include/fftw3.h,[acx_fftw_ok=yes])
	if test x$acx_fftw_ok = xyes; then		if test x$acx_fftw_ok = xyes; then
	AC_DEFINE(FFTW_H, "$1/include/fftw3.h", [FFTW header filename.])		AC_DEFINE(FFTW_H, $1"/include/fftw3.h, [FFTW header filename.])
	else		else
	AC_CHECK_HEADER(fftw3.h,[acx_fftw_ok=yes])		AC_CHECK_HEADER(fftw3.h,[acx_fftw_ok=yes])
	if test x$acx_fftw_ok = xyes; then		if test x$acx_fftw_ok = xyes; then
	AC_DEFINE(FFTW_H, "fftw.h", [FFTW header filename.])		AC_DEFINE(FFTW_H, "fftw3.h", [FFTW header filename.])
	else		else
	FFTW_ERROR="FFTW include files not found in $1/include!"		FFTW_ERROR="FFTW include files not found in $1/include!"
	fi		fi
	@@ -49,7 +49,7 @@ if test x$2 = x; then
	else		else
	AC_CHECK_HEADER($2/fftw3.h,[acx_fftw_ok=yes])		AC_CHECK_HEADER($2/fftw3.h,[acx_fftw_ok=yes])
	if test x$acx_fftw_ok = xyes; then		if test x$acx_fftw_ok = xyes; then
	AC_DEFINE(FFTW_H, "$2/fftw3.h", [FFTW header filename.])		AC_DEFINE_UNQUOTED(FFTW_H, "$2/fftw3.h", [FFTW header filename.])
	else		else
	FFTW_ERROR="FFTW include files not found in $2!"		FFTW_ERROR="FFTW include files not found in $2!"
	fi		fi