Skip to content

Commit 03ba756

Browse files
ebertinebertin
committed
Fix minor autoconf issues.
1 parent ef915de commit 03ba756

File tree

5 files changed

+30
-14
lines changed

5 files changed

+30
-14
lines changed

‎configure.ac‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ define([AC_CACHE_LOAD],)
3333
define([AC_CACHE_SAVE],)
3434

3535
# This is your standard AstrOmatic source code...
36-
AC_INIT(SCAMP, 2.14.0, [[email protected]],
37-
scamp, [http://astromatic.net/software/scamp])
36+
AC_INIT(SCAMP, 2.14.1, [[email protected]],
37+
scamp, [https://astromatic.net/software/scamp])
3838
AC_CONFIG_MACRO_DIR([m4])
3939
AC_CONFIG_AUX_DIR(autoconf)
4040
AC_CONFIG_SRCDIR(src/makeit.c)

‎doc/src/conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@
6767
# built documents.
6868
#
6969
# The short X.Y version.
70-
version = '2.14.0'
70+
version = '2.14.1'
7171
# The full version, including alpha/beta/rc tags.
72-
release = '2.14.0'
72+
release = '2.14.1'
7373

7474
# The language for content autogenerated by Sphinx. Refer to documentation
7575
# for a list of supported languages.

‎m4/acx_curl.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dnl You should have received a copy of the GNU General Public License
2323
dnl along with AstrOmatic software.
2424
dnl If not, see <http://www.gnu.org/licenses/>.
2525
dnl
26-
dnl Last modified: 15/02/2023
26+
dnl Last modified: 09/04/2025
2727
dnl
2828
dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
2929
dnl
@@ -50,7 +50,7 @@ acx_curl_ok=yes
5050
if test x$2 = x && test x$1 = x; then
5151
AC_CHECK_PROG(acx_curlconfig_ok, [curl-config], [yes], [no])
5252
if test x$acx_curlconfig_ok = xyes; then
53-
[CURL_CFLAGS=` --cflags`]
53+
[CURL_CFLAGS=`curl-config --cflags`]
5454
[CURL_LIBS=`curl-config --libs`]
5555
AC_DEFINE(CURL_H, "curl/curl.h", [cURL header filename.])
5656
fi

‎m4/acx_mkl.m4‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
77
dnl
88
dnl This file part of: AstrOmatic software
99
dnl
10-
dnl Copyright: (C) 2003-2022 IAP/CNRS/SorbonneU
10+
dnl Copyright: (C) 1994,1997 ESO
11+
dnl (C) 1995,1996 Leiden Observatory
12+
dnl (C) 1998-2021 IAP/CNRS/SorbonneU
13+
dnl (C) 2021-2023 CFHT/CNRS
14+
dnl (C) 2023-2025 CEA/AIM/UParisSaclay
1115
dnl
1216
dnl License: GNU General Public License
1317
dnl
@@ -23,7 +27,7 @@ dnl You should have received a copy of the GNU General Public License
2327
dnl along with AstrOmatic software.
2428
dnl If not, see <http://www.gnu.org/licenses/>.
2529
dnl
26-
dnl Last modified: 15/09/2022
30+
dnl Last modified: 19/03/2025
2731
dnl
2832
dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
2933
dnl
@@ -100,11 +104,13 @@ dnl 64 bit pointers
100104
AC_SUBST(MKL_CFLAGS, "-qopenmp -DMKL_ILP64 -I$mklroot/include")
101105
if test x$3 = xyes; then
102106
dnl Static linking
107+
AC_SUBST(MKL_LDFLAGS, "-qmkl-ilp64 -static-intel")
103108
AC_SUBST(MKL_LIBS, ["$mklroot/lib/libmkl_intel_ilp64.a \
104109
$mklroot/lib/libmkl_intel_thread.a \
105110
$mklroot/lib/libmkl_core.a -lpthread -lm"])
106111
else
107112
dnl Dynamic linking
113+
AC_SUBST(MKL_LDFLAGS, "-qmkl-ilp64")
108114
AC_SUBST(MKL_LIBS, "-L$mklroot/lib -lmkl_intel_ilp64 \
109115
-lmkl_intel_thread -lmkl_core -lpthread -lm")
110116
fi
@@ -113,11 +119,13 @@ dnl 32 bit pointers
113119
AC_SUBST(MKL_CFLAGS, "-qopenmp -I$mklroot/include")
114120
if test x$3 = xyes; then
115121
dnl Static linking
122+
AC_SUBST(MKL_LDFLAGS, "-qmkl -static-intel")
116123
AC_SUBST(MKL_LIBS, ["$mklroot/lib/libmkl_intel_lp64.a \
117124
$mklroot/lib/libmkl_intel_thread.a \
118125
$mklroot/lib/libmkl_core.a -lpthread -lm"])
119126
else
120127
dnl Dynamic linking
128+
AC_SUBST(MKL_LDFLAGS, "-qmkl-ilp64")
121129
AC_SUBST(MKL_LIBS, "-L$mklroot/lib -lmkl_intel_lp64 \
122130
-lmkl_intel_thread -lmkl_core -lpthread -lm")
123131
fi
@@ -127,11 +135,13 @@ dnl INTEL compiler uses IA32 architecture
127135
AC_SUBST(MKL_CFLAGS, "-qopenmp -I$mklroot/include")
128136
if test x$3 = xyes; then
129137
dnl Static linking
138+
AC_SUBST(MKL_LDFLAGS, "-qmkl -static-intel")
130139
AC_SUBST(MKL_LIBS, ["$mklroot/lib/libmkl_intel.a \
131140
$mklroot/lib/libmkl_intel_thread.a \
132141
$mklroot/lib/libmkl_core.a -lpthread -lm"])
133142
else
134143
dnl Dynamic linking
144+
AC_SUBST(MKL_LDFLAGS, "-qmkl")
135145
AC_SUBST(MKL_LIBS, "-L$mklroot/lib -lmkl_intel -lmkl_intel_thread \
136146
-lmkl_core -lpthread -lm")
137147
fi
@@ -145,12 +155,14 @@ dnl 64 bit pointers
145155
AC_SUBST(MKL_CFLAGS, "-qopenmp -DMKL_ILP64 -I$mklroot/include")
146156
if test x$3 = xyes; then
147157
dnl Static linking
158+
AC_SUBST(MKL_LDFLAGS, "-qmkl-ilp64 -static-intel")
148159
AC_SUBST(MKL_LIBS,
149160
["$startgroup,$mklroot/lib/intel64/libmkl_intel_ilp64.a,\
150161
$mklroot/lib/intel64/libmkl_intel_thread.a,\
151162
$mklroot/lib/intel64/libmkl_core.a,-end-group -lpthread -lm"])
152163
else
153164
dnl Dynamic linking
165+
AC_SUBST(MKL_LDFLAGS, "-qmkl-ilp64")
154166
AC_SUBST(MKL_LIBS, "-L$mklroot/lib/intel64 -lmkl_intel_ilp64 \
155167
-lmkl_intel_thread -lmkl_core -lpthread -lm")
156168
fi
@@ -159,12 +171,14 @@ dnl 32 bit pointers
159171
AC_SUBST(MKL_CFLAGS, "-qopenmp -I$mklroot/include")
160172
if test x$3 = xyes; then
161173
dnl Static linking
174+
AC_SUBST(MKL_LDFLAGS, "-qmkl-ilp64 -static-intel")
162175
AC_SUBST(MKL_LIBS,
163176
["$startgroup,$mklroot/lib/intel64/libmkl_intel_lp64.a,\
164177
$mklroot/lib/intel64/libmkl_intel_thread.a,\
165178
$mklroot/lib/intel64/libmkl_core.a,--end-group -lpthread -lm"])
166179
else
167180
dnl Dynamic linking
181+
AC_SUBST(MKL_LDFLAGS, "-qmkl-ilp64")
168182
AC_SUBST(MKL_LIBS, "-L$mklroot/lib/intel64 -lmkl_intel_lp64 \
169183
-lmkl_intel_thread -lmkl_core -lpthread -lm")
170184
fi
@@ -174,19 +188,19 @@ dnl INTEL compiler uses IA32 architecture
174188
AC_SUBST(MKL_CFLAGS, "-qopenmp -I$mklroot/include")
175189
if test x$3 = xyes; then
176190
dnl Static linking
191+
AC_SUBST(MKL_LDFLAGS, "-qmkl -static-intel")
177192
AC_SUBST(MKL_LIBS, ["$startgroup,$mklroot/lib/ia32/libmkl_intel.a,\
178193
$mklroot/lib/ia32/libmkl_intel_thread.a,\
179194
$mklroot/lib/ia32/libmkl_core.a,--end-group -lpthread -lm"])
180195
else
181196
dnl Dynamic linking
197+
AC_SUBST(MKL_LDFLAGS, "-qmkl")
182198
AC_SUBST(MKL_LIBS, "-L$mklroot/lib/ia32 -lmkl_intel -lmkl_intel_thread \
183199
-lmkl_core -lpthread -lm")
184200
fi
185201
fi
186202
fi
187203
188-
AC_SUBST(MKL_LDFLAGS, "")
189-
190204
dnl --------------------
191205
dnl Set internal flags
192206
dnl --------------------

‎scamp.spec.in‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
#
88
# This file part of: SCAMP
99
#
10-
# Copyright: (C) 2002-2020 IAP/CNRS/SorbonneU
10+
# Copyright: (C) 2002-2021 IAP/CNRS/SorbonneU
11+
# (C) 2021-2023 CFHT/CNRS
12+
# (C) 2023-2025 CEA/AIM/UParisSaclay
1113
#
1214
# License: GNU General Public License
1315
#
@@ -22,7 +24,7 @@
2224
# You should have received a copy of the GNU General Public License
2325
# along with SCAMP. If not, see <http://www.gnu.org/licenses/>.
2426
#
25-
# Last modified: 02/01/2020
27+
# Last modified: 09/04/2025
2628
#
2729
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
2830

@@ -36,8 +38,8 @@ Summary: compute astrometric and photometric solutions from SExtractor catalogs
3638
Name: %{name}
3739
Version: %{version}
3840
Release: %{release}
39-
Source0: http://astromatic.net/download/%{name}/%{name}-%{version}.tar.gz
40-
URL: http://astromatic.net/software/%{name}/
41+
Source0: https://download.astromatic.net/%{name}/%{name}-%{version}.tar.gz
42+
URL: https://astromatic.net/software/%{name}/
4143
License: GPL v3+
4244
Group: Sciences/Astronomy
4345
BuildRoot: %{_tmppath}/%{name}-buildroot

0 commit comments

Comments
 (0)