Skip to content

Commit a2d30e6

Browse files
LourensVeenLourensVeen
committed
Remove wget and always use curl to download
1 parent 8dd292c commit a2d30e6

40 files changed

Lines changed: 216 additions & 1885 deletions

File tree

‎lib/sapporo_light/support/configure‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3934,11 +3934,11 @@ if test x$ac_prog_cxx_stdcxx = xno
39343934
then :
39353935
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
39363936
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
3937-
if test ${ac_cv_prog_cxx_11+y}
3937+
if test ${ac_cv_prog_cxx_cxx11+y}
39383938
then :
39393939
printf %s "(cached) " >&6
39403940
else $as_nop
3941-
ac_cv_prog_cxx_11=no
3941+
ac_cv_prog_cxx_cxx11=no
39423942
ac_save_CXX=$CXX
39433943
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
39443944
/* end confdefs.h. */
@@ -3980,11 +3980,11 @@ if test x$ac_prog_cxx_stdcxx = xno
39803980
then :
39813981
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
39823982
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
3983-
if test ${ac_cv_prog_cxx_98+y}
3983+
if test ${ac_cv_prog_cxx_cxx98+y}
39843984
then :
39853985
printf %s "(cached) " >&6
39863986
else $as_nop
3987-
ac_cv_prog_cxx_98=no
3987+
ac_cv_prog_cxx_cxx98=no
39883988
ac_save_CXX=$CXX
39893989
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
39903990
/* end confdefs.h. */

‎src/amuse_adaptb/support/configure‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3637,11 +3637,11 @@ if test x$ac_prog_cxx_stdcxx = xno
36373637
then :
36383638
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
36393639
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
3640-
if test ${ac_cv_prog_cxx_11+y}
3640+
if test ${ac_cv_prog_cxx_cxx11+y}
36413641
then :
36423642
printf %s "(cached) " >&6
36433643
else $as_nop
3644-
ac_cv_prog_cxx_11=no
3644+
ac_cv_prog_cxx_cxx11=no
36453645
ac_save_CXX=$CXX
36463646
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
36473647
/* end confdefs.h. */
@@ -3683,11 +3683,11 @@ if test x$ac_prog_cxx_stdcxx = xno
36833683
then :
36843684
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
36853685
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
3686-
if test ${ac_cv_prog_cxx_98+y}
3686+
if test ${ac_cv_prog_cxx_cxx98+y}
36873687
then :
36883688
printf %s "(cached) " >&6
36893689
else $as_nop
3690-
ac_cv_prog_cxx_98=no
3690+
ac_cv_prog_cxx_cxx98=no
36913691
ac_save_CXX=$CXX
36923692
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
36933693
/* end confdefs.h. */

‎src/amuse_athena/support/configure‎

Lines changed: 9 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,6 @@ GUNZIP
674674
TAR
675675
DOWNLOAD
676676
CURL
677-
WGET
678677
RANLIB
679678
AR
680679
target_os
@@ -4420,108 +4419,6 @@ fi
44204419

44214420
# Find tools to download and unpack with
44224421

4423-
if test -n "$ac_tool_prefix"; then
4424-
# Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
4425-
set dummy ${ac_tool_prefix}wget; ac_word=$2
4426-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4427-
printf %s "checking for $ac_word... " >&6; }
4428-
if test ${ac_cv_prog_WGET+y}
4429-
then :
4430-
printf %s "(cached) " >&6
4431-
else $as_nop
4432-
if test -n "$WGET"; then
4433-
ac_cv_prog_WGET="$WGET" # Let the user override the test.
4434-
else
4435-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4436-
for as_dir in $PATH
4437-
do
4438-
IFS=$as_save_IFS
4439-
case $as_dir in #(((
4440-
'') as_dir=./ ;;
4441-
*/) ;;
4442-
*) as_dir=$as_dir/ ;;
4443-
esac
4444-
for ac_exec_ext in '' $ac_executable_extensions; do
4445-
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
4446-
ac_cv_prog_WGET="${ac_tool_prefix}wget"
4447-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
4448-
break 2
4449-
fi
4450-
done
4451-
done
4452-
IFS=$as_save_IFS
4453-
4454-
fi
4455-
fi
4456-
WGET=$ac_cv_prog_WGET
4457-
if test -n "$WGET"; then
4458-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
4459-
printf "%s\n" "$WGET" >&6; }
4460-
else
4461-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
4462-
printf "%s\n" "no" >&6; }
4463-
fi
4464-
4465-
4466-
fi
4467-
if test -z "$ac_cv_prog_WGET"; then
4468-
ac_ct_WGET=$WGET
4469-
# Extract the first word of "wget", so it can be a program name with args.
4470-
set dummy wget; ac_word=$2
4471-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4472-
printf %s "checking for $ac_word... " >&6; }
4473-
if test ${ac_cv_prog_ac_ct_WGET+y}
4474-
then :
4475-
printf %s "(cached) " >&6
4476-
else $as_nop
4477-
if test -n "$ac_ct_WGET"; then
4478-
ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
4479-
else
4480-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4481-
for as_dir in $PATH
4482-
do
4483-
IFS=$as_save_IFS
4484-
case $as_dir in #(((
4485-
'') as_dir=./ ;;
4486-
*/) ;;
4487-
*) as_dir=$as_dir/ ;;
4488-
esac
4489-
for ac_exec_ext in '' $ac_executable_extensions; do
4490-
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
4491-
ac_cv_prog_ac_ct_WGET="wget"
4492-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
4493-
break 2
4494-
fi
4495-
done
4496-
done
4497-
IFS=$as_save_IFS
4498-
4499-
fi
4500-
fi
4501-
ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
4502-
if test -n "$ac_ct_WGET"; then
4503-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
4504-
printf "%s\n" "$ac_ct_WGET" >&6; }
4505-
else
4506-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
4507-
printf "%s\n" "no" >&6; }
4508-
fi
4509-
4510-
if test "x$ac_ct_WGET" = x; then
4511-
WGET=""
4512-
else
4513-
case $cross_compiling:$ac_tool_warned in
4514-
yes:)
4515-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4516-
printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4517-
ac_tool_warned=yes ;;
4518-
esac
4519-
WGET=$ac_ct_WGET
4520-
fi
4521-
else
4522-
WGET="$ac_cv_prog_WGET"
4523-
fi
4524-
45254422
if test -n "$ac_tool_prefix"; then
45264423
# Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
45274424
set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -4625,24 +4522,16 @@ else
46254522
fi
46264523

46274524

4628-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
4629-
printf %s "checking for a wget or curl to download files with... " >&6; }
4630-
if test "x$WGET" != "x"
4525+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
4526+
printf %s "checking for a tool to download files with... " >&6; }
4527+
if test "x$CURL" != "x"
46314528
then
4632-
# The MESA SDK server rejects wget, this is the official work-around
4633-
DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
4529+
DOWNLOAD="$CURL -L"
46344530
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
46354531
printf "%s\n" "yes" >&6; }
46364532
else
4637-
if test "x$CURL" != "x"
4638-
then
4639-
DOWNLOAD="$CURL -L"
4640-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4641-
printf "%s\n" "yes" >&6; }
4642-
else
4643-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
4533+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
46444534
printf "%s\n" "no" >&6; }
4645-
fi
46464535
fi
46474536

46484537

@@ -6315,11 +6204,11 @@ if test x$ac_prog_cxx_stdcxx = xno
63156204
then :
63166205
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
63176206
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
6318-
if test ${ac_cv_prog_cxx_11+y}
6207+
if test ${ac_cv_prog_cxx_cxx11+y}
63196208
then :
63206209
printf %s "(cached) " >&6
63216210
else $as_nop
6322-
ac_cv_prog_cxx_11=no
6211+
ac_cv_prog_cxx_cxx11=no
63236212
ac_save_CXX=$CXX
63246213
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
63256214
/* end confdefs.h. */
@@ -6361,11 +6250,11 @@ if test x$ac_prog_cxx_stdcxx = xno
63616250
then :
63626251
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
63636252
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
6364-
if test ${ac_cv_prog_cxx_98+y}
6253+
if test ${ac_cv_prog_cxx_cxx98+y}
63656254
then :
63666255
printf %s "(cached) " >&6
63676256
else $as_nop
6368-
ac_cv_prog_cxx_98=no
6257+
ac_cv_prog_cxx_cxx98=no
63696258
ac_save_CXX=$CXX
63706259
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
63716260
/* end confdefs.h. */

‎src/amuse_bhtree/support/configure‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4357,11 +4357,11 @@ if test x$ac_prog_cxx_stdcxx = xno
43574357
then :
43584358
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
43594359
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
4360-
if test ${ac_cv_prog_cxx_11+y}
4360+
if test ${ac_cv_prog_cxx_cxx11+y}
43614361
then :
43624362
printf %s "(cached) " >&6
43634363
else $as_nop
4364-
ac_cv_prog_cxx_11=no
4364+
ac_cv_prog_cxx_cxx11=no
43654365
ac_save_CXX=$CXX
43664366
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
43674367
/* end confdefs.h. */
@@ -4403,11 +4403,11 @@ if test x$ac_prog_cxx_stdcxx = xno
44034403
then :
44044404
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
44054405
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
4406-
if test ${ac_cv_prog_cxx_98+y}
4406+
if test ${ac_cv_prog_cxx_cxx98+y}
44074407
then :
44084408
printf %s "(cached) " >&6
44094409
else $as_nop
4410-
ac_cv_prog_cxx_98=no
4410+
ac_cv_prog_cxx_cxx98=no
44114411
ac_save_CXX=$CXX
44124412
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
44134413
/* end confdefs.h. */

‎src/amuse_brutus/support/configure‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4477,11 +4477,11 @@ if test x$ac_prog_cxx_stdcxx = xno
44774477
then :
44784478
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
44794479
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
4480-
if test ${ac_cv_prog_cxx_11+y}
4480+
if test ${ac_cv_prog_cxx_cxx11+y}
44814481
then :
44824482
printf %s "(cached) " >&6
44834483
else $as_nop
4484-
ac_cv_prog_cxx_11=no
4484+
ac_cv_prog_cxx_cxx11=no
44854485
ac_save_CXX=$CXX
44864486
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
44874487
/* end confdefs.h. */
@@ -4523,11 +4523,11 @@ if test x$ac_prog_cxx_stdcxx = xno
45234523
then :
45244524
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
45254525
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
4526-
if test ${ac_cv_prog_cxx_98+y}
4526+
if test ${ac_cv_prog_cxx_cxx98+y}
45274527
then :
45284528
printf %s "(cached) " >&6
45294529
else $as_nop
4530-
ac_cv_prog_cxx_98=no
4530+
ac_cv_prog_cxx_cxx98=no
45314531
ac_save_CXX=$CXX
45324532
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
45334533
/* end confdefs.h. */

‎src/amuse_etics/support/configure‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3618,11 +3618,11 @@ if test x$ac_prog_cxx_stdcxx = xno
36183618
then :
36193619
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
36203620
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
3621-
if test ${ac_cv_prog_cxx_11+y}
3621+
if test ${ac_cv_prog_cxx_cxx11+y}
36223622
then :
36233623
printf %s "(cached) " >&6
36243624
else $as_nop
3625-
ac_cv_prog_cxx_11=no
3625+
ac_cv_prog_cxx_cxx11=no
36263626
ac_save_CXX=$CXX
36273627
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
36283628
/* end confdefs.h. */
@@ -3664,11 +3664,11 @@ if test x$ac_prog_cxx_stdcxx = xno
36643664
then :
36653665
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
36663666
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
3667-
if test ${ac_cv_prog_cxx_98+y}
3667+
if test ${ac_cv_prog_cxx_cxx98+y}
36683668
then :
36693669
printf %s "(cached) " >&6
36703670
else $as_nop
3671-
ac_cv_prog_cxx_98=no
3671+
ac_cv_prog_cxx_cxx98=no
36723672
ac_save_CXX=$CXX
36733673
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
36743674
/* end confdefs.h. */

‎src/amuse_fastkick/support/configure‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3517,11 +3517,11 @@ if test x$ac_prog_cxx_stdcxx = xno
35173517
then :
35183518
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
35193519
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
3520-
if test ${ac_cv_prog_cxx_11+y}
3520+
if test ${ac_cv_prog_cxx_cxx11+y}
35213521
then :
35223522
printf %s "(cached) " >&6
35233523
else $as_nop
3524-
ac_cv_prog_cxx_11=no
3524+
ac_cv_prog_cxx_cxx11=no
35253525
ac_save_CXX=$CXX
35263526
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
35273527
/* end confdefs.h. */
@@ -3563,11 +3563,11 @@ if test x$ac_prog_cxx_stdcxx = xno
35633563
then :
35643564
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
35653565
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
3566-
if test ${ac_cv_prog_cxx_98+y}
3566+
if test ${ac_cv_prog_cxx_cxx98+y}
35673567
then :
35683568
printf %s "(cached) " >&6
35693569
else $as_nop
3570-
ac_cv_prog_cxx_98=no
3570+
ac_cv_prog_cxx_cxx98=no
35713571
ac_save_CXX=$CXX
35723572
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
35733573
/* end confdefs.h. */

‎src/amuse_gadget2/support/configure‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4438,11 +4438,11 @@ if test x$ac_prog_cxx_stdcxx = xno
44384438
then :
44394439
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
44404440
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
4441-
if test ${ac_cv_prog_cxx_11+y}
4441+
if test ${ac_cv_prog_cxx_cxx11+y}
44424442
then :
44434443
printf %s "(cached) " >&6
44444444
else $as_nop
4445-
ac_cv_prog_cxx_11=no
4445+
ac_cv_prog_cxx_cxx11=no
44464446
ac_save_CXX=$CXX
44474447
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
44484448
/* end confdefs.h. */
@@ -4484,11 +4484,11 @@ if test x$ac_prog_cxx_stdcxx = xno
44844484
then :
44854485
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
44864486
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
4487-
if test ${ac_cv_prog_cxx_98+y}
4487+
if test ${ac_cv_prog_cxx_cxx98+y}
44884488
then :
44894489
printf %s "(cached) " >&6
44904490
else $as_nop
4491-
ac_cv_prog_cxx_98=no
4491+
ac_cv_prog_cxx_cxx98=no
44924492
ac_save_CXX=$CXX
44934493
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
44944494
/* end confdefs.h. */

‎src/amuse_halogen/support/configure‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4319,11 +4319,11 @@ if test x$ac_prog_cxx_stdcxx = xno
43194319
then :
43204320
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
43214321
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
4322-
if test ${ac_cv_prog_cxx_11+y}
4322+
if test ${ac_cv_prog_cxx_cxx11+y}
43234323
then :
43244324
printf %s "(cached) " >&6
43254325
else $as_nop
4326-
ac_cv_prog_cxx_11=no
4326+
ac_cv_prog_cxx_cxx11=no
43274327
ac_save_CXX=$CXX
43284328
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
43294329
/* end confdefs.h. */
@@ -4365,11 +4365,11 @@ if test x$ac_prog_cxx_stdcxx = xno
43654365
then :
43664366
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
43674367
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
4368-
if test ${ac_cv_prog_cxx_98+y}
4368+
if test ${ac_cv_prog_cxx_cxx98+y}
43694369
then :
43704370
printf %s "(cached) " >&6
43714371
else $as_nop
4372-
ac_cv_prog_cxx_98=no
4372+
ac_cv_prog_cxx_cxx98=no
43734373
ac_save_CXX=$CXX
43744374
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
43754375
/* end confdefs.h. */

0 commit comments

Comments
 (0)