Commit 6847fc4b authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed obsolete autoconf macros in configure.ac 

Added control of the number of threads in MKL calls.
Added support for negative NTHREADS (= max number of threads).
Pushed version number to 2.18.1.
parent aa52c8bf

aclocal.m4

+0 −12
Original line number Diff line number Diff line
@@ -8944,18 +8944,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], 
     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])

])



# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005

# Free Software Foundation, Inc.

#

# This file is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

# with or without modifications, as long as this notice is preserved.



# serial 8



# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.

AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])



# Do all the work for Automake.                             -*- Autoconf -*-



# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

acx_mkl.m4

+3 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 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/07/2012

dnl	Last modified:		11/07/2012

dnl

dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

dnl
@@ -63,6 +63,7 @@ dnl -------------------- 
dnl Set internal flags

dnl --------------------



AC_DEFINE(HAVE_MKL,1, [Define if you have the MKL libraries.])

AC_DEFINE(HAVE_FFTW,1, [Define if you have the FFTW libraries.])

AC_DEFINE(HAVE_LAPACK,1, [Define if you have the LAPACK libraries.])

AC_DEFINE(HAVE_LAPACKE,1, [Define if you have the LAPACKe libraries.])
@@ -71,6 +72,7 @@ dnl -------------------- 
dnl Set include files

dnl --------------------



AC_DEFINE_UNQUOTED(MKL_H, "mkl.h", [MKL header filename.])

AC_DEFINE_UNQUOTED(FFTW_H, "fftw/fftw3_mkl.h", [FFTW header filename.])

AC_DEFINE_UNQUOTED(LAPACK_H, "mkl_lapack.h", [LAPACK header filename.])

AC_DEFINE_UNQUOTED(LAPACKE_H, "mkl_lapacke.h", [LAPACKe header filename.])

config.h.in

+6 −0
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ 
/* Define to 1 if you have the `mkdir' function. */

#undef HAVE_MKDIR



/* Define if you have the MKL libraries. */

#undef HAVE_MKL



/* Define to 1 if you have a working `mmap' system call. */

#undef HAVE_MMAP
@@ -191,6 +194,9 @@ 
   */

#undef LT_OBJDIR



/* MKL header filename. */

#undef MKL_H



/* Name of package */

#undef PACKAGE

configure

+25 −17
Original line number Diff line number Diff line 
#! /bin/sh

# Guess values for system-dependent variables and create Makefiles.

# Generated by GNU Autoconf 2.68 for sextractor 2.18.0.

# Generated by GNU Autoconf 2.68 for sextractor 2.18.1.

#

# Report bugs to <bertin@iap.fr>.

#
@@ -570,8 +570,8 @@ MAKEFLAGS= 
# Identity of this package.

PACKAGE_NAME='sextractor'

PACKAGE_TARNAME='sextractor'

PACKAGE_VERSION='2.18.0'

PACKAGE_STRING='sextractor 2.18.0'

PACKAGE_VERSION='2.18.1'

PACKAGE_STRING='sextractor 2.18.1'

PACKAGE_BUGREPORT='bertin@iap.fr'

PACKAGE_URL=''
@@ -763,7 +763,7 @@ with_gnu_ld 
with_sysroot

enable_libtool_lock

enable_largefile

with_atlas

with_atlas_libdir

with_atlas_incdir

with_fftw

with_fftw_incdir
@@ -1324,7 +1324,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.18.0 to adapt to many kinds of systems.

\`configure' configures sextractor 2.18.1 to adapt to many kinds of systems.



Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1394,7 +1394,7 @@ fi 


if test -n "$ac_init_help"; then

  case $ac_init_help in

     short | recursive ) echo "Configuration of sextractor 2.18.0:";;

     short | recursive ) echo "Configuration of sextractor 2.18.1:";;

   esac

  cat <<\_ACEOF
@@ -1435,12 +1435,12 @@ Optional Packages: 
  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]

  --with-sysroot=DIR Search for dependent libraries within DIR

                        (or the compiler's sysroot if not specified).

  --with-atlas=<ATLAS library path>

  --with-atlas-libdir=<ATLAS library path>

                          Provide an alternative path to the ATLAS library

  --with-atlas-incdir=<ATLAS include dir>

                          Provide an alternative path to the ATLAS include

                          directory

  --with-fftw=<FFTW library path>

  --with-fftw-libdir=<FFTW library path>

                          Provide an alternative path to the FFTW library

  --with-fftw-incdir=<FFTW include dir>

                          Provide an alternative path to the FFTW include
@@ -1525,7 +1525,7 @@ fi 
test -n "$ac_init_help" && exit $ac_status

if $ac_init_version; then

  cat <<\_ACEOF

sextractor configure 2.18.0

sextractor configure 2.18.1

generated by GNU Autoconf 2.68



Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1948,7 +1948,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.18.0, which was

It was created by sextractor $as_me 2.18.1, which was

generated by GNU Autoconf 2.68.  Invocation command line was



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


# Define the identity of the package.

 PACKAGE='sextractor'

 VERSION='2.18.0'

 VERSION='2.18.1'





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



# Checks for INTEL math header files.

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

if test "$enable_icc" = "yes"; then

  for ac_header in mathimf.h

do :

  ac_fn_c_check_header_mongrel "$LINENO" "mathimf.h" "ac_cv_header_mathimf_h" "$ac_includes_default"
@@ -12783,9 +12783,9 @@ fi 


# Provide special options for ATLAS



# Check whether --with-atlas was given.

if test "${with_atlas+set}" = set; then :

  withval=$with_atlas;

# Check whether --with-atlas-libdir was given.

if test "${with_atlas_libdir+set}" = set; then :

  withval=$with_atlas_libdir;

fi
@@ -13300,6 +13300,9 @@ fi 






$as_echo "#define HAVE_MKL 1" >>confdefs.h





$as_echo "#define HAVE_FFTW 1" >>confdefs.h
@@ -13311,6 +13314,11 @@ $as_echo "#define HAVE_LAPACKE 1" >>confdefs.h 






cat >>confdefs.h <<_ACEOF

#define MKL_H "mkl.h"

_ACEOF





cat >>confdefs.h <<_ACEOF

#define FFTW_H "fftw/fftw3_mkl.h"

_ACEOF
@@ -15505,7 +15513,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.18.0, which was

This file was extended by sextractor $as_me 2.18.1, which was

generated by GNU Autoconf 2.68.  Invocation command line was



  CONFIG_FILES    = $CONFIG_FILES
@@ -15571,7 +15579,7 @@ _ACEOF 
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"

ac_cs_version="\\

sextractor config.status 2.18.0

sextractor config.status 2.18.1

configured by $0, generated by GNU Autoconf 2.68,

  with options \\"\$ac_cs_config\\"

configure.ac

+16 −16
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:		09/07/2012

#	Last modified:		11/07/2012

#

#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -31,10 +31,10 @@ define([AC_CACHE_LOAD],) 
define([AC_CACHE_SAVE],)



# This is your standard Bertin source code...

AC_INIT(sextractor, 2.18.0, [bertin@iap.fr])

AC_INIT(sextractor, 2.18.1, [bertin@iap.fr])

AC_CONFIG_SRCDIR(src/makeit.c)

AC_CONFIG_AUX_DIR(autoconf)

AM_CONFIG_HEADER(config.h)

AC_CONFIG_HEADERS(config.h)

AM_INIT_AUTOMAKE

date=`date +%Y-%m-%d`

date2=`date +"%a %b %d %Y"`
@@ -58,7 +58,7 @@ AC_MSG_RESULT([*********** Configuring: $PACKAGE $VERSION ($date) **********]) 
# Provide special option for choosing automatically the compilation flags.

AC_MSG_CHECKING([if compilation flags should be set automatically])

AC_ARG_ENABLE(auto-flags,

	[AC_HELP_STRING([--enable-auto-flags],

	[AS_HELP_STRING([--enable-auto-flags],

	[Let the configure script choose the compilation flags \

(off by default)])],

	AC_MSG_RESULT([yes]),
@@ -67,7 +67,7 @@ AC_ARG_ENABLE(auto-flags, 
# Provide special option for the Linux Intel C compiler

AC_MSG_CHECKING([whether we should use the INTEL compiler])

AC_ARG_ENABLE(icc,

	[AC_HELP_STRING([--enable-icc],

	[AS_HELP_STRING([--enable-icc],

	[Enable special mode for compilation with the Intel compiler \

(off by default)])],

        CC="icc"
@@ -105,7 +105,7 @@ AC_HEADER_STDC 
AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/mman.h \

		sys/types.h unistd.h])

# Checks for INTEL math header files.

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

if test "$enable_icc" = "yes"; then

  AC_CHECK_HEADERS(mathimf.h)

fi
@@ -134,25 +134,25 @@ AC_SYS_LARGEFILE 
AC_FUNC_FSEEKO



# Provide special options for ATLAS

AC_ARG_WITH(atlas,

        [AC_HELP_STRING([--with-atlas=<ATLAS library path>],

AC_ARG_WITH(atlas-libdir,

        [AS_HELP_STRING([--with-atlas-libdir=<ATLAS library path>],

        [Provide an alternative path to the ATLAS library])])

AC_ARG_WITH(atlas-incdir,

        [AC_HELP_STRING([--with-atlas-incdir=<ATLAS include dir>],

        [AS_HELP_STRING([--with-atlas-incdir=<ATLAS include dir>],

        [Provide an alternative path to the ATLAS include directory])])



# Provide special options for FFTW

AC_ARG_WITH(fftw,

        [AC_HELP_STRING([--with-fftw=<FFTW library path>],

        [AS_HELP_STRING([--with-fftw-libdir=<FFTW library path>],

        [Provide an alternative path to the FFTW library])])

AC_ARG_WITH(fftw-incdir,

        [AC_HELP_STRING([--with-fftw-incdir=<FFTW include dir>],

        [AS_HELP_STRING([--with-fftw-incdir=<FFTW include dir>],

        [Provide an alternative path to the FFTW include directory])])



# Provide a special option for the default XSLT URL

with_xsl_url="file://"$(URBI_RESOLVE_DIR([$datadir]))"/$PACKAGE_NAME/$PACKAGE_NAME.xsl"

AC_ARG_WITH(xsl_url,

	[AC_HELP_STRING([--with-xsl_url=<default URL for XSLT filter>],

	[AS_HELP_STRING([--with-xsl_url=<default URL for XSLT filter>],

	[Provide an alternative default URL of the XSLT filter])])



AC_DEFINE_UNQUOTED([XSL_URL], "$with_xsl_url",[Default URL of the XSLT filter])
@@ -161,7 +161,7 @@ AC_DEFINE_UNQUOTED([XSL_URL], "$with_xsl_url",[Default URL of the XSLT filter]) 
enable_model_fitting="yes"

AC_MSG_CHECKING([if model-fitting should be disabled])

AC_ARG_ENABLE([model-fitting],

	[AC_HELP_STRING([--disable-model-fitting],

	[AS_HELP_STRING([--disable-model-fitting],

	[Disable model-fitting and library dependencies (enabled by default)])],

	if test "$enable_model_fitting" = "no"; then

	  AC_MSG_RESULT([yes])
@@ -172,7 +172,7 @@ AC_ARG_ENABLE([model-fitting], 
# Set flags for multithreading

n_pthreads=16

AC_ARG_ENABLE(threads,

        [AC_HELP_STRING([--enable-threads@<:@=<max_number_of_threads>@:>@],

        [AS_HELP_STRING([--enable-threads@<:@=<max_number_of_threads>@:>@],

	[Enable multhreading (on with up to 16 threads by default)])],

    if test "$enableval" = "no"; then

      use_pthreads="no"
@@ -190,7 +190,7 @@ use_pthreads="no" 
# Provide special option for gprof profiling

AC_MSG_CHECKING([for gprof profiler mode])

AC_ARG_ENABLE(gprof,

	[AC_HELP_STRING([--enable-gprof],

	[AS_HELP_STRING([--enable-gprof],

	[Enable special mode for compilation with the gprof profiler \

(off by default)])],

	AC_MSG_RESULT([yes]),
@@ -199,7 +199,7 @@ AC_ARG_ENABLE(gprof, 
# Enable linking options for making the executable as portable as possible.

AC_MSG_CHECKING([best linking option])

AC_ARG_ENABLE(best-link,

	[AC_HELP_STRING([--enable-best-link],

	[AS_HELP_STRING([--enable-best-link],

	[Choose the right combination of static and dynamic linking to make \

the executable as portable as possible (off by default)])],

	AC_MSG_RESULT([yes]),