diff --git a/configure.ac b/configure.ac index 6706f04..ea2a150 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ # # This file part of: PSFEx # -# Copyright: (C) 2002-2022 IAP/CNRS/SorbonneU/CFHT +# Copyright: (C) 2002-2023 IAP/CNRS/SorbonneU/CFHT # # License: GNU General Public License # @@ -22,7 +22,7 @@ # You should have received a copy of the GNU General Public License # along with PSFEx. If not, see . # -# Last modified: 20/09/2022 +# Last modified: 05/04/2023 # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -31,7 +31,7 @@ define([AC_CACHE_LOAD],) define([AC_CACHE_SAVE],) # This is your standard AstrOmatic source code... -AC_INIT(PSFEx, 3.24.0, [astromatic@astromatic.net], +AC_INIT(PSFEx, 3.24.1, [astromatic@astromatic.net], psfex, [http://astromatic.net/software/psfex]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(autoconf) @@ -50,9 +50,9 @@ AC_SUBST(DATE3, "$date3") # Include macros sinclude(acx_atlas.m4) +sinclude(acx_openblas.m4) sinclude(acx_fftw.m4) sinclude(acx_mkl.m4) -sinclude(acx_openblas.m4) sinclude(acx_plplot.m4) sinclude(acx_prog_cc_optim.m4) sinclude(acx_pthread.m4) @@ -345,9 +345,9 @@ fi if test "$enable_best_link" = "yes"; then if test "$enable_iccx" = "yes"; then AM_LDFLAGS="-static-intel -qopenmp-link=static -shared-libgcc \ - -static-libtool-libs -avoid-version $AM_LDFLAGS" + -avoid-version $AM_LDFLAGS" else - AM_LDFLAGS="-shared-libgcc -static-libtool-libs -avoid-version $AM_LDFLAGS" + AM_LDFLAGS="-shared-libgcc -avoid-version $AM_LDFLAGS" fi fi diff --git a/doc/src/conf.py b/doc/src/conf.py index d092972..aa14bfa 100644 --- a/doc/src/conf.py +++ b/doc/src/conf.py @@ -63,9 +63,9 @@ # built documents. # # The short X.Y version. -version = '3.24.0' +version = '3.24.1' # The full version, including alpha/beta/rc tags. -release = '3.24.0' +release = '3.24.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -76,7 +76,7 @@ # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: -today = 'Tue Sep 20 2022' +today = 'Wed Apr 05 2023' # Else, today_fmt is used as the format for a strftime call. #today_fmt = '%B %d, %Y' diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4 index 4d60031..0f8695f 100644 --- a/m4/acx_pthread.m4 +++ b/m4/acx_pthread.m4 @@ -7,7 +7,7 @@ dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% dnl dnl This file part of: AstrOmatic software dnl -dnl Copyright: (C) 2002-2010 Emmanuel Bertin -- IAP/CNRS/UPMC +dnl Copyright: (C) 2002-2022 Emmanuel Bertin -- IAP/CNRS/SorbonneU dnl (C) 2001 Steven G. Johnson (original version) dnl dnl Licenses: GPL (this version) @@ -25,7 +25,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with AstrOmatic software. dnl If not, see . dnl -dnl Last modified: 09/10/2010 +dnl Last modified: 15/09/2022 dnl dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% dnl @@ -88,7 +88,7 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then save_LIBS="$LIBS" LIBS="$PTHREAD_LIBS $LIBS" AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) + AC_LINK_IFELSE([AC_LANG_CALL([], pthread_join)], acx_pthread_ok=yes) AC_MSG_RESULT($acx_pthread_ok) if test x"$acx_pthread_ok" = xno; then PTHREAD_LIBS="" @@ -170,10 +170,10 @@ for flag in $acx_pthread_flags; do # pthread_cleanup_push because it is one of the few pthread # functions on Solaris that doesn't have a non-functional libc stub. # We try pthread_create on general principles. - AC_TRY_LINK([#include ], + AC_LINK_IFELSE([AC_LANG_CALL([#include ], [pthread_t th; pthread_join(th, 0); pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], + pthread_create(0,0,0,0); pthread_cleanup_pop(0); ])], [acx_pthread_ok=yes]) LIBS="$save_LIBS" @@ -199,12 +199,12 @@ if test "x$acx_pthread_ok" = xyes; then # Detect AIX lossage: threads are created detached by default # and the JOINABLE attribute has a nonstandard name (UNDETACHED). AC_MSG_CHECKING([for joinable pthread attribute]) - AC_TRY_LINK([#include ], - [int attr=PTHREAD_CREATE_JOINABLE;], + AC_LINK_IFELSE([AC_LANG_CALL([#include ], + [int attr=PTHREAD_CREATE_JOINABLE;])], ok=PTHREAD_CREATE_JOINABLE, ok=unknown) if test x"$ok" = xunknown; then - AC_TRY_LINK([#include ], - [int attr=PTHREAD_CREATE_UNDETACHED;], + AC_LINK_IFELSE([AC_LANG_CALL([#include ], + [int attr=PTHREAD_CREATE_UNDETACHED;])], ok=PTHREAD_CREATE_UNDETACHED, ok=unknown) fi if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then