Commit 54b951b1 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Switched to single precision for model fitting.

Changed configure behaviour towards CFLAGS and LDFLAGS: automatic settings are now applied only if the --enable-automatic-flags configure option is set (thanks to S.Pascual).
Version number pushed to 2.9.0.
parent 3b59ee2e
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -91,6 +91,9 @@ distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AMTAR = @AMTAR@
AM_CFLAGS = @AM_CFLAGS@
AM_CPPFLAGS = @AM_CPPFLAGS@
AM_LDFLAGS = @AM_LDFLAGS@
AR = @AR@
AR = @AR@
ATLAS_CFLAGS = @ATLAS_CFLAGS@
ATLAS_CFLAGS = @ATLAS_CFLAGS@
ATLAS_ERROR = @ATLAS_ERROR@
ATLAS_ERROR = @ATLAS_ERROR@
+3 −3
Original line number Original line Diff line number Diff line
@@ -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 (Unicos 10.0.0.8) C compiler.
dnl
dnl
dnl This macro is a modification of Ville Laurikari's VL_PROG_CC_WARNINGS
dnl This macro is a modification of Ville Laurikari's VL_PROG_CC_WARNINGS
dnl @version 1.3 (2009-04-01)
dnl @version 1.4 (2009-09-08)
dnl @authors Emmanuel Bertin <bertin@iap.fr> Ville Laurikari <vl@iki.fi>
dnl @authors Emmanuel Bertin <bertin@iap.fr> Ville Laurikari <vl@iki.fi>
dnl
dnl
AC_DEFUN([ACX_PROG_CC_OPTIM], [
AC_DEFUN([ACX_PROG_CC_OPTIM], [
@@ -101,8 +101,8 @@ EOF
      rm -f conftest.*
      rm -f conftest.*
    fi
    fi
    if test -n "$prog_cc_optim_flags"; then
    if test -n "$prog_cc_optim_flags"; then
      CFLAGS="$CFLAGS $prog_cc_optim_flags"
      AM_CFLAGS="$CFLAGS $prog_cc_optim_flags"
      LDFLAGS="$LDFLAGS $prog_ld_optim_flags"
      AM_LDFLAGS="$LDFLAGS $prog_ld_optim_flags"
    else
    else
      prog_cc_optim_flags=""
      prog_cc_optim_flags=""
      prog_ld_optim_flags=""
      prog_ld_optim_flags=""
+76 −59
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.8.9.
# Generated by GNU Autoconf 2.63 for sextractor 2.9.0.
#
#
# 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.8.9'
PACKAGE_VERSION='2.9.0'
PACKAGE_STRING='sextractor 2.8.9'
PACKAGE_STRING='sextractor 2.9.0'
PACKAGE_BUGREPORT='bertin@iap.fr'
PACKAGE_BUGREPORT='bertin@iap.fr'
ac_unique_file="src/makeit.c"
ac_unique_file="src/makeit.c"
@@ -792,6 +792,9 @@ ac_includes_default="\
#endif"
#endif"
ac_subst_vars='LTLIBOBJS
ac_subst_vars='LTLIBOBJS
AM_LDFLAGS
AM_CPPFLAGS
AM_CFLAGS
ATLAS_ERROR
ATLAS_ERROR
ATLAS_WARN
ATLAS_WARN
ATLAS_LIB
ATLAS_LIB
@@ -915,6 +918,7 @@ SHELL'
ac_subst_files=''
ac_subst_files=''
ac_user_opts='
ac_user_opts='
enable_option_checking
enable_option_checking
enable_automatic_flags
enable_icc
enable_icc
enable_dependency_tracking
enable_dependency_tracking
enable_static
enable_static
@@ -1500,7 +1504,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.8.9 to adapt to many kinds of systems.
\`configure' configures sextractor 2.9.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1570,7 +1574,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.8.9:";;
     short | recursive ) echo "Configuration of sextractor 2.9.0:";;
   esac
   esac
  cat <<\_ACEOF
  cat <<\_ACEOF
@@ -1578,6 +1582,9 @@ Optional Features:
  --disable-option-checking  ignore unrecognized --enable/--with options
  --disable-option-checking  ignore unrecognized --enable/--with options
  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
  --enable-automatic-flags
                          Let the configure script choose the compilation
                          flags (off by default)
  --enable-icc            Enable special mode for compilation with the Intel
  --enable-icc            Enable special mode for compilation with the Intel
                          compiler (off by default)
                          compiler (off by default)
  --disable-dependency-tracking  speeds up one-time build
  --disable-dependency-tracking  speeds up one-time build
@@ -1697,7 +1704,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.8.9
sextractor configure 2.9.0
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,
@@ -1711,7 +1718,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.8.9, which was
It was created by sextractor $as_me 2.9.0, which was
generated by GNU Autoconf 2.63.  Invocation command line was
generated by GNU Autoconf 2.63.  Invocation command line was
  $ $0 $@
  $ $0 $@
@@ -2414,7 +2421,7 @@ fi
# Define the identity of the package.
# Define the identity of the package.
 PACKAGE='sextractor'
 PACKAGE='sextractor'
 VERSION='2.8.9'
 VERSION='2.9.0'
cat >>confdefs.h <<_ACEOF
cat >>confdefs.h <<_ACEOF
@@ -2606,11 +2613,20 @@ $as_echo "*********** Configuring: $PACKAGE $VERSION ($date) **********" >&6; }
# Initialize the list of compilers to consider
# Initialize the list of compilers to consider
cclist="cc gcc"
cclist="cc gcc"
# Backup and reset the input CFLAGS and LDFLAGS
# Provide special option for choosing automatically the compilation flags.
mycflags="$CFLAGS"
{ $as_echo "$as_me:$LINENO: checking if compilation flags are set automatically" >&5
CFLAGS=""
$as_echo_n "checking if compilation flags are set automatically... " >&6; }
myldflags="$LDFLAGS"
# Check whether --enable-automatic-flags was given.
LDFLAGS=""
if test "${enable_automatic_flags+set}" = set; then
  enableval=$enable_automatic_flags; use_autoflag="yes"
	{ $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
else
  use_autoflag="no"
	{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
# Provide special option for the Linux Intel C compiler
# Provide special option for the Linux Intel C compiler
{ $as_echo "$as_me:$LINENO: checking for Linux Intel C compiler mode" >&5
{ $as_echo "$as_me:$LINENO: checking for Linux Intel C compiler mode" >&5
@@ -4430,6 +4446,10 @@ if test "$ac_res" != no; then
fi
fi
# Override automatic CFLAGS and LDFLAGS with those of user
if test "$use_autoflag" = "yes"; then
  CFLAGS=""
  LDFLAGS =""
  msg="for C compiler optimization flags"
  msg="for C compiler optimization flags"
  { $as_echo "$as_me:$LINENO: checking $msg" >&5
  { $as_echo "$as_me:$LINENO: checking $msg" >&5
@@ -4507,8 +4527,8 @@ EOF
      rm -f conftest.*
      rm -f conftest.*
    fi
    fi
    if test -n "$prog_cc_optim_flags"; then
    if test -n "$prog_cc_optim_flags"; then
      CFLAGS="$CFLAGS $prog_cc_optim_flags"
      AM_CFLAGS="$CFLAGS $prog_cc_optim_flags"
      LDFLAGS="$LDFLAGS $prog_ld_optim_flags"
      AM_LDFLAGS="$LDFLAGS $prog_ld_optim_flags"
    else
    else
      prog_cc_optim_flags=""
      prog_cc_optim_flags=""
      prog_ld_optim_flags=""
      prog_ld_optim_flags=""
@@ -4518,6 +4538,7 @@ fi
{ $as_echo "$as_me:$LINENO: result: $prog_cc_optim_flags" >&5
{ $as_echo "$as_me:$LINENO: result: $prog_cc_optim_flags" >&5
$as_echo "$prog_cc_optim_flags" >&6; }
$as_echo "$prog_cc_optim_flags" >&6; }
fi
# Check whether --enable-static was given.
# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then
if test "${enable_static+set}" = set; then
  enableval=$enable_static; p=${PACKAGE-default}
  enableval=$enable_static; p=${PACKAGE-default}
@@ -5299,7 +5320,7 @@ ia64-*-hpux*)
  ;;
  ;;
*-*-irix6*)
*-*-irix6*)
  # Find out which ABI we are using.
  # Find out which ABI we are using.
  echo '#line 5302 "configure"' > conftest.$ac_ext
  echo '#line 5323 "configure"' > conftest.$ac_ext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  (eval $ac_compile) 2>&5
  ac_status=$?
  ac_status=$?
@@ -8074,11 +8095,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:8077: $lt_compile\"" >&5)
   (eval echo "\"\$as_me:8098: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   ac_status=$?
   cat conftest.err >&5
   cat conftest.err >&5
   echo "$as_me:8081: \$? = $ac_status" >&5
   echo "$as_me:8102: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
     # So say no if there are warnings other than the usual output.
@@ -8364,11 +8385,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:8367: $lt_compile\"" >&5)
   (eval echo "\"\$as_me:8388: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   ac_status=$?
   cat conftest.err >&5
   cat conftest.err >&5
   echo "$as_me:8371: \$? = $ac_status" >&5
   echo "$as_me:8392: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
     # So say no if there are warnings other than the usual output.
@@ -8468,11 +8489,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:8471: $lt_compile\"" >&5)
   (eval echo "\"\$as_me:8492: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   ac_status=$?
   cat out/conftest.err >&5
   cat out/conftest.err >&5
   echo "$as_me:8475: \$? = $ac_status" >&5
   echo "$as_me:8496: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
   then
     # The compiler can only warn and ignore the option if not recognized
     # The compiler can only warn and ignore the option if not recognized
@@ -10855,7 +10876,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
  cat > conftest.$ac_ext <<EOF
#line 10858 "configure"
#line 10879 "configure"
#include "confdefs.h"
#include "confdefs.h"
#if HAVE_DLFCN_H
#if HAVE_DLFCN_H
@@ -10955,7 +10976,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
  cat > conftest.$ac_ext <<EOF
#line 10958 "configure"
#line 10979 "configure"
#include "confdefs.h"
#include "confdefs.h"
#if HAVE_DLFCN_H
#if HAVE_DLFCN_H
@@ -13383,11 +13404,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:13386: $lt_compile\"" >&5)
   (eval echo "\"\$as_me:13407: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   ac_status=$?
   cat conftest.err >&5
   cat conftest.err >&5
   echo "$as_me:13390: \$? = $ac_status" >&5
   echo "$as_me:13411: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
     # So say no if there are warnings other than the usual output.
@@ -13487,11 +13508,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:13490: $lt_compile\"" >&5)
   (eval echo "\"\$as_me:13511: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   ac_status=$?
   cat out/conftest.err >&5
   cat out/conftest.err >&5
   echo "$as_me:13494: \$? = $ac_status" >&5
   echo "$as_me:13515: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
   then
     # The compiler can only warn and ignore the option if not recognized
     # The compiler can only warn and ignore the option if not recognized
@@ -15051,11 +15072,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:15054: $lt_compile\"" >&5)
   (eval echo "\"\$as_me:15075: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   ac_status=$?
   cat conftest.err >&5
   cat conftest.err >&5
   echo "$as_me:15058: \$? = $ac_status" >&5
   echo "$as_me:15079: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
     # So say no if there are warnings other than the usual output.
@@ -15155,11 +15176,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:15158: $lt_compile\"" >&5)
   (eval echo "\"\$as_me:15179: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   ac_status=$?
   cat out/conftest.err >&5
   cat out/conftest.err >&5
   echo "$as_me:15162: \$? = $ac_status" >&5
   echo "$as_me:15183: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
   then
     # The compiler can only warn and ignore the option if not recognized
     # The compiler can only warn and ignore the option if not recognized
@@ -17352,11 +17373,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:17355: $lt_compile\"" >&5)
   (eval echo "\"\$as_me:17376: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   ac_status=$?
   cat conftest.err >&5
   cat conftest.err >&5
   echo "$as_me:17359: \$? = $ac_status" >&5
   echo "$as_me:17380: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
     # So say no if there are warnings other than the usual output.
@@ -17642,11 +17663,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:17645: $lt_compile\"" >&5)
   (eval echo "\"\$as_me:17666: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   ac_status=$?
   cat conftest.err >&5
   cat conftest.err >&5
   echo "$as_me:17649: \$? = $ac_status" >&5
   echo "$as_me:17670: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
     # So say no if there are warnings other than the usual output.
@@ -17746,11 +17767,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:17749: $lt_compile\"" >&5)
   (eval echo "\"\$as_me:17770: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   ac_status=$?
   cat out/conftest.err >&5
   cat out/conftest.err >&5
   echo "$as_me:17753: \$? = $ac_status" >&5
   echo "$as_me:17774: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
   then
     # The compiler can only warn and ignore the option if not recognized
     # The compiler can only warn and ignore the option if not recognized
@@ -23568,7 +23589,7 @@ fi
  CC="$PTHREAD_CC"
  CC="$PTHREAD_CC"
  CFLAGS="$CFLAGS $PTHREAD_CFLAGS -D_REENTRANT"
  AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS -D_REENTRANT"
  LIBS="$PTHREAD_LIBS $LIBS"
  LIBS="$PTHREAD_LIBS $LIBS"
fi
fi
 if test $use_pthreads = "yes"; then
 if test $use_pthreads = "yes"; then
@@ -24342,7 +24363,7 @@ LIBS=""
if test x$acx_fftw_ok = xyes; then
if test x$acx_fftw_ok = xyes; then
  if test x$fftw_libdir = x; then
  if test x$fftw_libdir = x; then
    if test xno = xyes; then
    if test xyes = xyes; then
      { $as_echo "$as_me:$LINENO: checking for fftwf_execute in -lfftw3f" >&5
      { $as_echo "$as_me:$LINENO: checking for fftwf_execute in -lfftw3f" >&5
$as_echo_n "checking for fftwf_execute in -lfftw3f... " >&6; }
$as_echo_n "checking for fftwf_execute in -lfftw3f... " >&6; }
if test "${ac_cv_lib_fftw3f_fftwf_execute+set}" = set; then
if test "${ac_cv_lib_fftw3f_fftwf_execute+set}" = set; then
@@ -24508,7 +24529,7 @@ _ACEOF
      fi
      fi
    fi
    fi
    if test x$acx_fftw_ok = xyes && test x$use_pthreads = xyes; then
    if test x$acx_fftw_ok = xyes && test x$use_pthreads = xyes; then
      if test xno = xyes; then
      if test xyes = xyes; then
        { $as_echo "$as_me:$LINENO: checking for fftwf_init_threads in -lfftw3f" >&5
        { $as_echo "$as_me:$LINENO: checking for fftwf_init_threads in -lfftw3f" >&5
$as_echo_n "checking for fftwf_init_threads in -lfftw3f... " >&6; }
$as_echo_n "checking for fftwf_init_threads in -lfftw3f... " >&6; }
if test "${ac_cv_lib_fftw3f_fftwf_init_threads+set}" = set; then
if test "${ac_cv_lib_fftw3f_fftwf_init_threads+set}" = set; then
@@ -24837,7 +24858,7 @@ _ACEOF
      fi
      fi
    fi
    fi
  else
  else
    if test xno = xyes; then
    if test xyes = xyes; then
      { $as_echo "$as_me:$LINENO: checking for fftwf_execute in -lfftw3f" >&5
      { $as_echo "$as_me:$LINENO: checking for fftwf_execute in -lfftw3f" >&5
$as_echo_n "checking for fftwf_execute in -lfftw3f... " >&6; }
$as_echo_n "checking for fftwf_execute in -lfftw3f... " >&6; }
if test "${ac_cv_lib_fftw3f_fftwf_execute+set}" = set; then
if test "${ac_cv_lib_fftw3f_fftwf_execute+set}" = set; then
@@ -25003,7 +25024,7 @@ _ACEOF
      fi
      fi
    fi
    fi
    if test x$acx_fftw_ok = xyes && test x$use_pthreads = xyes; then
    if test x$acx_fftw_ok = xyes && test x$use_pthreads = xyes; then
      if test xno = xyes; then
      if test xyes = xyes; then
        { $as_echo "$as_me:$LINENO: checking for fftwf_init_threads in -lfftw3f" >&5
        { $as_echo "$as_me:$LINENO: checking for fftwf_init_threads in -lfftw3f" >&5
$as_echo_n "checking for fftwf_init_threads in -lfftw3f... " >&6; }
$as_echo_n "checking for fftwf_init_threads in -lfftw3f... " >&6; }
if test "${ac_cv_lib_fftw3f_fftwf_init_threads+set}" = set; then
if test "${ac_cv_lib_fftw3f_fftwf_init_threads+set}" = set; then
@@ -27712,33 +27733,29 @@ fi
# Link with gprof option
# Link with gprof option
if test "$use_gprof" = "yes"; then
if test "$use_gprof" = "yes"; then
  if test "$use_icc" = "yes"; then
  if test "$use_icc" = "yes"; then
    CFLAGS="$CFLAGS -pq"
    AM_CFLAGS="$AM_CFLAGS -pq"
  else
  else
    CFLAGS="$CFLAGS -pg"
    AM_CFLAGS="$AM_CFLAGS -pg"
  fi
  fi
  use_static="no"
  use_static="no"
fi
fi
# Static linking option
# Static linking option
if test "$use_static" = "yes"; then
if test "$use_static" = "yes"; then
  LDFLAGS="-static -shared-libgcc $LDFLAGS"
  AM_LDFLAGS="-static -shared-libgcc $AM_LDFLAGS"
fi
fi
# Override automatic CFLAGS and LDFLAGS with those of user
#if test -n "$mycflags"; then
#CFLAGS="$mycflags"
#fi
#if test -n "$myldflags"; then
#LDFLAGS="$myldflags"
#fi
# Display compiler and linker flags
# Display compiler and linker flags
{ $as_echo "$as_me:$LINENO: result: ***************************************************************" >&5
{ $as_echo "$as_me:$LINENO: result: ***************************************************************" >&5
$as_echo "***************************************************************" >&6; }
$as_echo "***************************************************************" >&6; }
{ $as_echo "$as_me:$LINENO: result: Compile cmdline:  $CC $CFLAGS" >&5
{ $as_echo "$as_me:$LINENO: result: Compile cmdline:  $CC $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS" >&5
$as_echo "Compile cmdline:  $CC $CFLAGS" >&6; }
$as_echo "Compile cmdline:  $CC $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS" >&6; }
{ $as_echo "$as_me:$LINENO: result: Link    cmdline:  $CC $LDFLAGS $LIBS" >&5
{ $as_echo "$as_me:$LINENO: result: Link    cmdline:  $CC $AM_LDFLAGS $LDFLAGS $LIBS" >&5
$as_echo "Link    cmdline:  $CC $LDFLAGS $LIBS" >&6; }
$as_echo "Link    cmdline:  $CC $AM_LDFLAGS $LDFLAGS $LIBS" >&6; }
{ $as_echo "$as_me:$LINENO: result: Default XSLT URL: $xsl_url" >&5
{ $as_echo "$as_me:$LINENO: result: Default XSLT URL: $xsl_url" >&5
$as_echo "Default XSLT URL: $xsl_url" >&6; }
$as_echo "Default XSLT URL: $xsl_url" >&6; }
{ $as_echo "$as_me:$LINENO: result: ***************************************************************" >&5
{ $as_echo "$as_me:$LINENO: result: ***************************************************************" >&5
@@ -28127,7 +28144,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.8.9, which was
This file was extended by sextractor $as_me 2.9.0, 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
@@ -28190,7 +28207,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.8.9
sextractor config.status 2.9.0
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'`\\"
+27 −21
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.8.9, [bertin@iap.fr])
AC_INIT(sextractor, 2.9.0, [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)
@@ -32,11 +32,16 @@ AC_MSG_RESULT([*********** Configuring: $PACKAGE $VERSION ($date) **********])
# Initialize the list of compilers to consider
# Initialize the list of compilers to consider
cclist="cc gcc"
cclist="cc gcc"


# Backup and reset the input CFLAGS and LDFLAGS
# Provide special option for choosing automatically the compilation flags.
mycflags="$CFLAGS"
AC_MSG_CHECKING([if compilation flags are set automatically])
CFLAGS=""
AC_ARG_ENABLE(automatic-flags,
myldflags="$LDFLAGS"
	[AC_HELP_STRING([--enable-automatic-flags],
LDFLAGS=""
	[Let the configure script choose the compilation flags \
(off by default)])],
        use_autoflag="yes"
	AC_MSG_RESULT([yes]),
        use_autoflag="no"
	AC_MSG_RESULT([no]))


# Provide special option for the Linux Intel C compiler
# Provide special option for the Linux Intel C compiler
AC_MSG_CHECKING([for Linux Intel C compiler mode])
AC_MSG_CHECKING([for Linux Intel C compiler mode])
@@ -57,7 +62,12 @@ AC_PROG_CC([$cclist])
# C Compiler: Check that it is ANSI C and POSIX-compliant
# C Compiler: Check that it is ANSI C and POSIX-compliant
AM_PROG_CC_STDC
AM_PROG_CC_STDC
AC_ISC_POSIX
AC_ISC_POSIX
# Override automatic CFLAGS and LDFLAGS with those of user
if test "$use_autoflag" = "yes"; then
  CFLAGS=""
  LDFLAGS =""
  ACX_PROG_CC_OPTIM
  ACX_PROG_CC_OPTIM
fi
AC_DISABLE_STATIC
AC_DISABLE_STATIC
#AC_DISABLE_SHARED
#AC_DISABLE_SHARED
AC_PROG_LIBTOOL
AC_PROG_LIBTOOL
@@ -182,13 +192,13 @@ if test "$use_pthreads" = "yes"; then
# CC, CFLAGS and LIBS are system and compiler-dependent
# CC, CFLAGS and LIBS are system and compiler-dependent
  ACX_PTHREAD
  ACX_PTHREAD
  CC="$PTHREAD_CC"
  CC="$PTHREAD_CC"
  [CFLAGS="$CFLAGS $PTHREAD_CFLAGS -D_REENTRANT"]
  [AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS -D_REENTRANT"]
  LIBS="$PTHREAD_LIBS $LIBS"
  LIBS="$PTHREAD_LIBS $LIBS"
fi
fi
AM_CONDITIONAL(USE_THREADS, test $use_pthreads = "yes")
AM_CONDITIONAL(USE_THREADS, test $use_pthreads = "yes")


################ handle the FFTW library (Fourier transforms) ################
################ handle the FFTW library (Fourier transforms) ################
ACX_FFTW($fftw_libdir,$fftw_incdir,$use_pthreads,no,
ACX_FFTW($fftw_libdir,$fftw_incdir,$use_pthreads,yes,
	[use_fftw=yes],[use_fftw=no])
	[use_fftw=yes],[use_fftw=no])
if test "$use_fftw" = "yes"; then
if test "$use_fftw" = "yes"; then
  LIBS="$FFTW_LIBS $LIBS"
  LIBS="$FFTW_LIBS $LIBS"
@@ -214,30 +224,26 @@ fi
# Link with gprof option
# Link with gprof option
if test "$use_gprof" = "yes"; then
if test "$use_gprof" = "yes"; then
  if test "$use_icc" = "yes"; then
  if test "$use_icc" = "yes"; then
    CFLAGS="$CFLAGS -pq"
    AM_CFLAGS="$AM_CFLAGS -pq"
  else
  else
    CFLAGS="$CFLAGS -pg"
    AM_CFLAGS="$AM_CFLAGS -pg"
  fi
  fi
  use_static="no"
  use_static="no"
fi
fi


# Static linking option
# Static linking option
if test "$use_static" = "yes"; then
if test "$use_static" = "yes"; then
  LDFLAGS="-static -shared-libgcc $LDFLAGS"
  AM_LDFLAGS="-static -shared-libgcc $AM_LDFLAGS"
fi
fi


# Override automatic CFLAGS and LDFLAGS with those of user
AC_SUBST(AM_CFLAGS)
#if test -n "$mycflags"; then
AC_SUBST(AM_CPPFLAGS)
#CFLAGS="$mycflags"
AC_SUBST(AM_LDFLAGS)
#fi
#if test -n "$myldflags"; then
#LDFLAGS="$myldflags"
#fi


# Display compiler and linker flags
# Display compiler and linker flags
AC_MSG_RESULT([***************************************************************])
AC_MSG_RESULT([***************************************************************])
AC_MSG_RESULT([Compile cmdline:  $CC $CFLAGS])
AC_MSG_RESULT([Compile cmdline:  $CC $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS])
AC_MSG_RESULT([Link    cmdline:  $CC $LDFLAGS $LIBS])
AC_MSG_RESULT([Link    cmdline:  $CC $AM_LDFLAGS $LDFLAGS $LIBS])
AC_MSG_RESULT([Default XSLT URL: $xsl_url])
AC_MSG_RESULT([Default XSLT URL: $xsl_url])
AC_MSG_RESULT([***************************************************************])
AC_MSG_RESULT([***************************************************************])


+3 −0
Original line number Original line Diff line number Diff line
@@ -55,6 +55,9 @@ MANS = $(dist_man_MANS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AMTAR = @AMTAR@
AM_CFLAGS = @AM_CFLAGS@
AM_CPPFLAGS = @AM_CPPFLAGS@
AM_LDFLAGS = @AM_LDFLAGS@
AR = @AR@
AR = @AR@
ATLAS_CFLAGS = @ATLAS_CFLAGS@
ATLAS_CFLAGS = @ATLAS_CFLAGS@
ATLAS_ERROR = @ATLAS_ERROR@
ATLAS_ERROR = @ATLAS_ERROR@
Loading