Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit b6342d1

Browse files
nthierynthiery
committed
Merge branch 'develop' into categories/full-subcategories-16340
Easy conflict: src/sage/categories/magmas.py
2 parents 2b0164b + 920c16e commit b6342d1

File tree

678 files changed

+41528
-9029
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

678 files changed

+41528
-9029
lines changed

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Sage version 6.3.beta0, released 2014-05-10
1+
Sage version 6.3.beta4, released 2014-06-19

‎build/deps

+9-9
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,12 @@ $(INST)/prereq: ../configure
158158
echo "If you would like to try to build Sage anyway (to help porting),"; \
159159
echo "export the variable 'SAGE_PORT' to something non-empty."; \
160160
exit 1; \
161-
else \
161+
else \
162162
echo "Since 'SAGE_PORT' is set, we will try to build anyway."; \
163-
fi; )
163+
fi; )
164164
touch $@
165165

166-
$(INST)/$(BZIP2): $(INST)/prereq
166+
$(INST)/$(BZIP2): $(INST)/prereq $(INST)/$(PKGCONF)
167167
+$(PIPE) "$(SAGE_SPKG) $(BZIP2) 2>&1" "tee -a $(SAGE_LOGS)/$(BZIP2).log"
168168

169169
$(INST)/$(PATCH): $(INST)/$(BZIP2)
@@ -176,7 +176,7 @@ $(INST)/$(PATCH): $(INST)/$(BZIP2)
176176
$(INST)/$(ATLAS): $(INST)/$(PYTHON)
177177
+$(PIPE) "$(SAGE_SPKG) $(ATLAS) 2>&1" "tee -a $(SAGE_LOGS)/$(ATLAS).log"
178178

179-
$(INST)/$(BOEHM_GC):
179+
$(INST)/$(BOEHM_GC): $(INST)/$(PKGCONF)
180180
+$(PIPE) "$(SAGE_SPKG) $(BOEHM_GC) 2>&1" "tee -a $(SAGE_LOGS)/$(BOEHM_GC).log"
181181

182182
$(INST)/$(BOOST_CROPPED):
@@ -185,7 +185,7 @@ $(INST)/$(BOOST_CROPPED):
185185
$(INST)/$(CLIQUER):
186186
+$(PIPE) "$(SAGE_SPKG) $(CLIQUER) 2>&1" "tee -a $(SAGE_LOGS)/$(CLIQUER).log"
187187

188-
$(INST)/$(NCURSES):
188+
$(INST)/$(NCURSES): $(INST)/$(PKGCONF)
189189
+$(PIPE) "$(SAGE_SPKG) $(NCURSES) 2>&1" "tee -a $(SAGE_LOGS)/$(NCURSES).log"
190190

191191
$(INST)/$(READLINE): $(INST)/$(NCURSES)
@@ -211,7 +211,7 @@ $(INST)/$(GRAPHS):
211211
$(INST)/$(GLPK): $(INST)/$(MPIR) $(INST)/$(ZLIB)
212212
+$(PIPE) "$(SAGE_SPKG) $(GLPK) 2>&1" "tee -a $(SAGE_LOGS)/$(GLPK).log"
213213

214-
$(INST)/$(PYTHON): $(INST)/$(ZLIB) $(INST)/$(BZIP2) \
214+
$(INST)/$(PYTHON): $(INST)/$(ZLIB) $(INST)/$(BZIP2) $(INST)/$(PKGCONF) \
215215
$(INST)/$(READLINE) $(INST)/$(SQLITE) $(INST)/$(LIBPNG)
216216
+$(PIPE) "$(SAGE_SPKG) $(PYTHON) 2>&1" "tee -a $(SAGE_LOGS)/$(PYTHON).log"
217217

@@ -401,7 +401,7 @@ $(INST)/$(ECL): $(INST)/$(MPIR) $(INST)/$(READLINE) $(INST)/$(BOEHM_GC)
401401
$(INST)/$(MAXIMA): $(INST)/$(ECL)
402402
+$(PIPE) "$(SAGE_SPKG) $(MAXIMA) 2>&1" "tee -a $(SAGE_LOGS)/$(MAXIMA).log"
403403

404-
$(INST)/$(R): $(INST)/$(ATLAS) $(INST)/$(ICONV) $(INST)/$(READLINE)
404+
$(INST)/$(R): $(INST)/$(ATLAS) $(INST)/$(ICONV) $(INST)/$(READLINE) $(INST)/$(PKGCONF)
405405
+$(PIPE) "$(SAGE_SPKG) $(R) 2>&1" "tee -a $(SAGE_LOGS)/$(R).log"
406406

407407
$(INST)/$(RPY): $(INST)/$(PYTHON) $(INST)/$(R)
@@ -422,7 +422,7 @@ $(INST)/$(FLINT): $(INST)/$(MPIR) $(INST)/$(MPFR) $(INST)/$(NTL)
422422
$(INST)/$(ECLIB): $(INST)/$(PARI) $(INST)/$(NTL) $(INST)/$(FLINT)
423423
+$(PIPE) "$(SAGE_SPKG) $(ECLIB) 2>&1" "tee -a $(SAGE_LOGS)/$(ECLIB).log"
424424

425-
$(INST)/$(M4RI): $(INST)/$(LIBPNG)
425+
$(INST)/$(M4RI): $(INST)/$(LIBPNG) $(INST)/$(PKGCONF)
426426
+$(PIPE) "$(SAGE_SPKG) $(M4RI) 2>&1" "tee -a $(SAGE_LOGS)/$(M4RI).log"
427427

428428
$(INST)/$(M4RIE): $(INST)/$(M4RI) $(INST)/$(GIVARO) $(INST)/$(NTL)
@@ -527,7 +527,7 @@ $(INST)/$(PKGCONF):
527527
$(INST)/$(PKGCONFIG): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
528528
+$(PIPE) "$(SAGE_SPKG) $(PKGCONFIG) 2>&1" "tee -a $(SAGE_LOGS)/$(PKGCONFIG).log"
529529

530-
$(INST)/$(NUMPY): $(INST)/$(PYTHON) $(INST)/$(ATLAS)
530+
$(INST)/$(NUMPY): $(INST)/$(PYTHON) $(INST)/$(ATLAS) $(INST)/$(PKGCONF)
531531
+$(PIPE) "$(SAGE_SPKG) $(NUMPY) 2>&1" "tee -a $(SAGE_LOGS)/$(NUMPY).log"
532532

533533
$(INST)/$(SCIPY): $(INST)/$(ATLAS) $(INST)/$(NUMPY)

‎build/pkgs/atlas/spkg-install

+1-1
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ def configure(arch=None, isa_ext=None):
329329

330330
# use hard floats on ARM
331331
if conf['ARM?']:
332-
cmd += '-D c -DATL_ARM_HARDFP=1'
332+
cmd += ' -D c -DATL_ARM_HARDFP=1'
333333

334334
# set machine architecture
335335
if arch is not None:

‎build/pkgs/cddlib/patches/lib-src-gmp_Makefile.am.patch

+7
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,10 @@ index b3ab11a..a9673b8 100644
1212

1313
include_HEADERS = \
1414
cdd.h \
15+
@@ -24,5 +25,5 @@
16+
cddtypes_f.h \
17+
setoper.h
18+
19+
-AM_CPPFLAGS = -I$(gmpincludedir) -DGMPRATIONAL
20+
+AM_CPPFLAGS = -DGMPRATIONAL
21+
AM_LDFLAGS = -version-info 0:0:0

‎build/pkgs/cddlib/patches/lib-src-gmp_Makefile.in.patch

+12-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ diff --git a/src.bak/lib-src-gmp/Makefile.in b/src/lib-src-gmp/Makefile.in
22
index 4ab9342..93ff335 100644
33
--- a/src.bak/lib-src-gmp/Makefile.in
44
+++ b/src/lib-src-gmp/Makefile.in
5-
@@ -54,7 +54,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
5+
@@ -54,7 +54,7 @@
66
libcddgmp_la_LIBADD =
77
am_libcddgmp_la_OBJECTS = cddcore.lo cddlp.lo cddmp.lo cddio.lo \
88
cddlib.lo cddproj.lo cddcore_f.lo cddlp_f.lo cddmp_f.lo \
@@ -11,7 +11,7 @@ index 4ab9342..93ff335 100644
1111
libcddgmp_la_OBJECTS = $(am_libcddgmp_la_OBJECTS)
1212
DEFAULT_INCLUDES = -I.@am__isrc@
1313
depcomp = $(SHELL) $(top_srcdir)/depcomp
14-
@@ -199,7 +199,8 @@ cddmp_f.c \
14+
@@ -199,7 +199,8 @@
1515
cddio_f.c \
1616
cddlib_f.c \
1717
cddproj_f.c \
@@ -21,7 +21,16 @@ index 4ab9342..93ff335 100644
2121

2222
include_HEADERS = \
2323
cdd.h \
24-
@@ -293,6 +294,7 @@ distclean-compile:
24+
@@ -210,7 +211,7 @@
25+
cddtypes_f.h \
26+
setoper.h
27+
28+
-AM_CPPFLAGS = -I$(gmpincludedir) -DGMPRATIONAL
29+
+AM_CPPFLAGS = -DGMPRATIONAL
30+
AM_LDFLAGS = -version-info 0:0:0
31+
all: all-am
32+
33+
@@ -293,6 +294,7 @@
2534
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cddmp_f.Plo@am__quote@
2635
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cddproj.Plo@am__quote@
2736
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cddproj_f.Plo@am__quote@

‎build/pkgs/cddlib/patches/src-gmp_Makefile.am.patch

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ diff --git a/src.bak/src-gmp/Makefile.am b/src/src-gmp/Makefile.am
22
index e4dbb86..e579d71 100644
33
--- a/src.bak/src-gmp/Makefile.am
44
+++ b/src/src-gmp/Makefile.am
5-
@@ -11,7 +11,8 @@ testcdd1_gmp \
5+
@@ -11,7 +11,8 @@
66
testcdd2_gmp \
77
testlp1_gmp \
88
testlp2_gmp \
@@ -12,11 +12,15 @@ index e4dbb86..e579d71 100644
1212
#cddmathlink
1313

1414
scdd_gmp_SOURCES = simplecdd.c
15-
@@ -27,6 +28,7 @@ testcdd2_gmp_SOURCES = testcdd2.c
15+
@@ -27,10 +28,9 @@
1616
testlp1_gmp_SOURCES = testlp1.c
1717
testlp2_gmp_SOURCES = testlp2.c
1818
testlp3_gmp_SOURCES = testlp3.c
1919
+cdd_both_reps_gmp_SOURCES = cdd_both_reps.c
2020
# cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c
2121

2222
LDADD = ../lib-src-gmp/libcddgmp.la
23+
-AM_LDFLAGS = -L$(gmplibdir)
24+
INCLUDES = -I../lib-src-gmp
25+
-INCLUDES += -I$(gmpincludedir)
26+
AM_CPPFLAGS = -DGMPRATIONAL

‎build/pkgs/cddlib/patches/src-gmp_Makefile.in.patch

+12-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ diff --git a/src.bak/src-gmp/Makefile.in b/src/src-gmp/Makefile.in
22
index f88c83f..3470dc9 100644
33
--- a/src.bak/src-gmp/Makefile.in
44
+++ b/src/src-gmp/Makefile.in
5-
@@ -37,7 +37,8 @@ bin_PROGRAMS = scdd_gmp$(EXEEXT) lcdd_gmp$(EXEEXT) \
5+
@@ -37,7 +37,8 @@
66
projection_gmp$(EXEEXT) adjacency_gmp$(EXEEXT) \
77
allfaces_gmp$(EXEEXT) testshoot_gmp$(EXEEXT) \
88
testcdd1_gmp$(EXEEXT) testcdd2_gmp$(EXEEXT) \
@@ -12,7 +12,7 @@ index f88c83f..3470dc9 100644
1212
subdir = src-gmp
1313
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
1414
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
15-
@@ -57,6 +58,10 @@ am_allfaces_gmp_OBJECTS = allfaces.$(OBJEXT)
15+
@@ -57,6 +58,10 @@
1616
allfaces_gmp_OBJECTS = $(am_allfaces_gmp_OBJECTS)
1717
allfaces_gmp_LDADD = $(LDADD)
1818
allfaces_gmp_DEPENDENCIES = ../lib-src-gmp/libcddgmp.la
@@ -23,7 +23,7 @@ index f88c83f..3470dc9 100644
2323
am_fourier_gmp_OBJECTS = fourier.$(OBJEXT)
2424
fourier_gmp_OBJECTS = $(am_fourier_gmp_OBJECTS)
2525
fourier_gmp_LDADD = $(LDADD)
26-
@@ -114,19 +119,19 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
26+
@@ -114,19 +119,19 @@
2727
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
2828
$(LDFLAGS) -o $@
2929
SOURCES = $(adjacency_gmp_SOURCES) $(allfaces_gmp_SOURCES) \
@@ -55,15 +55,20 @@ index f88c83f..3470dc9 100644
5555
ETAGS = etags
5656
CTAGS = ctags
5757
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
58-
@@ -254,6 +259,7 @@ testcdd2_gmp_SOURCES = testcdd2.c
58+
@@ -254,10 +259,10 @@
5959
testlp1_gmp_SOURCES = testlp1.c
6060
testlp2_gmp_SOURCES = testlp2.c
6161
testlp3_gmp_SOURCES = testlp3.c
6262
+cdd_both_reps_gmp_SOURCES = cdd_both_reps.c
6363
# cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c
6464
LDADD = ../lib-src-gmp/libcddgmp.la
65-
AM_LDFLAGS = -L$(gmplibdir)
66-
@@ -326,6 +332,9 @@ adjacency_gmp$(EXEEXT): $(adjacency_gmp_OBJECTS) $(adjacency_gmp_DEPENDENCIES)
65+
-AM_LDFLAGS = -L$(gmplibdir)
66+
-INCLUDES = -I../lib-src-gmp -I$(gmpincludedir)
67+
+INCLUDES = -I../lib-src-gmp
68+
AM_CPPFLAGS = -DGMPRATIONAL
69+
all: all-am
70+
71+
@@ -326,6 +331,9 @@
6772
allfaces_gmp$(EXEEXT): $(allfaces_gmp_OBJECTS) $(allfaces_gmp_DEPENDENCIES)
6873
@rm -f allfaces_gmp$(EXEEXT)
6974
$(LINK) $(allfaces_gmp_OBJECTS) $(allfaces_gmp_LDADD) $(LIBS)
@@ -73,7 +78,7 @@ index f88c83f..3470dc9 100644
7378
fourier_gmp$(EXEEXT): $(fourier_gmp_OBJECTS) $(fourier_gmp_DEPENDENCIES)
7479
@rm -f fourier_gmp$(EXEEXT)
7580
$(LINK) $(fourier_gmp_OBJECTS) $(fourier_gmp_LDADD) $(LIBS)
76-
@@ -368,6 +377,7 @@ distclean-compile:
81+
@@ -368,6 +376,7 @@
7782

7883
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adjacency.Po@am__quote@
7984
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/allfaces.Po@am__quote@

‎build/pkgs/configure/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=f84edfe5ea286c69e40c8be16fdff2bede9a2050
3-
md5=e6b56c8709cbdad74a5254d357c3060f
4-
cksum=3422919565
2+
sha1=100d46c2358df82a93feb63bc339620f413caa1b
3+
md5=d10af4cfec628f992109225444e68ba3
4+
cksum=553182482

‎build/pkgs/configure/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
27
1+
34

‎build/pkgs/d3js/SPKG.txt

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
= d3js =
2+
3+
== Description ==
4+
5+
D3.js is a JavaScript library for manipulating documents based on data.
6+
The file d3.min.js will be placed into the ${SAGE_SHARE}/d3js/ directory.
7+
8+
== License ==
9+
10+
BSD 3-Clause License
11+
12+
== SPKG Maintainers ==
13+
14+
* Thierry Monteil
15+
16+
== Upstream Contact ==
17+
18+
Author: Mike Bostock (http://bost.ocks.org/mike/)
19+
Home page: http://d3js.org/
20+
21+
== Dependencies ==
22+
23+
None.
24+
25+
== Special Update/Build Instructions ==
26+
27+
Two kind of archives can be downloaded from d3.js website: one with all source
28+
code and tests that weights 2,9M (both in zip and tar.gz formats) and one with
29+
the final javascript scripts which weights 121K (zip format only). Since
30+
testing requires node.js that is not shipped with Sage, we currenlty ship the
31+
final js only. Hence we have to transform it from zip to tar.gz format.
32+
Running sage-src should do all the repackaging job.
33+

‎build/pkgs/d3js/checksums.ini

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tarball=d3js-VERSION.tar.gz
2+
sha1=2fd4da34ca9e645cf81bf914d289c21c7bb8c166
3+
md5=d859a120f1eaebb8b563f4598868c564
4+
cksum=527881311

‎build/pkgs/d3js/package-version.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.4.8

‎build/pkgs/d3js/spkg-install

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/sh
2+
3+
if [ -z "$SAGE_SHARE" ]; then
4+
echo >&2 "SAGE_SHARE undefined ... exiting"
5+
echo >&2 "Maybe run 'sage --sh'?"
6+
exit 1
7+
fi
8+
9+
TARGET="${SAGE_SHARE}/d3js"
10+
if [ ! -d "${TARGET}" ]; then
11+
mkdir "${TARGET}"
12+
fi
13+
14+
cp 'src/d3.min.js' "${TARGET}/"
15+

‎build/pkgs/d3js/spkg-src

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
[ -n "${SAGE_ROOT}" ] || SAGE_ROOT="$(pwd)/../../../"
6+
7+
8+
# prepare a clean directory.
9+
[ -d "work" ] && rm -rf "work"
10+
mkdir "work"
11+
cd "work"
12+
13+
14+
# determine latest version.
15+
wget 'https://raw.githubusercontent.com/mbostock/d3/master/package.json'
16+
GIT_VERSION="$(grep '"version":' 'package.json' | sed 's/.*: "\(.*\)",/\1/g')"
17+
18+
19+
# fetch source and check version.
20+
wget "https://github.com/mbostock/d3/releases/download/v${GIT_VERSION}/d3.zip"
21+
unzip 'd3.zip'
22+
ZIP_VERSION="$(grep 'version:' 'd3.js' | sed 's/.*: "\(.*\)"/\1/g')"
23+
if [ ! "${GIT_VERSION}" = "${ZIP_VERSION}" ] ; then
24+
echo "Version mismatch: ${GIT_VERSION} vs ${ZIP_VERSION}."
25+
exit 1
26+
fi
27+
28+
29+
# build and move tarball
30+
mkdir "d3js-${ZIP_VERSION}"
31+
mv 'd3.min.js' 'LICENSE' "d3js-${ZIP_VERSION}"
32+
tar czvf "d3js-${ZIP_VERSION}.tar.gz" "d3js-${ZIP_VERSION}"
33+
mv "d3js-${ZIP_VERSION}.tar.gz" "${SAGE_ROOT}/upstream/"
34+
35+
36+
# update package info
37+
cd ..
38+
echo "${ZIP_VERSION}" > 'package-version.txt'
39+
sage -sh 'sage-fix-pkg-checksums'
40+
41+

‎build/pkgs/database_cremona_ellcurve/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=database_cremona_ellcurve-VERSION.tar.bz2
2-
sha1=25f256d78bf5c4454d85bb9a22df2d396e4962ba
3-
md5=14de1b11227fdd66e1a87e8101940988
4-
cksum=2753267872
2+
sha1=ab96f509574419c03d9f1c8820c4d96042a17a04
3+
md5=56956829063534142f9f12bc1274c01c
4+
cksum=2400753722

‎build/pkgs/database_cremona_ellcurve/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20140325
1+
20140512

‎build/pkgs/database_gap/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=database_gap-VERSION.tar.bz2
2-
sha1=6e5f63df55881a509076c4ecbd02c7afc8f81ef9
3-
md5=6f9d4632f6d2f4a7000c22cff5d15406
4-
cksum=1275532986
2+
sha1=0e81cd017dc0542fc5faf923324eb1fffb61cdeb
3+
md5=879fc85f53fa9ff9f12dc7ebd621a528
4+
cksum=3437971482

‎build/pkgs/database_gap/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.7.4
1+
4.7.5

‎build/pkgs/ecl/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=ecl-VERSION.tar.bz2
2-
sha1=0f5a540bd6d089d206cce674e0c73f4036191547
3-
md5=204bb44496fdda0e552a987f003fed69
4-
cksum=1587965735
2+
sha1=c79fa3573afad1834cf6057c15f303505fc0011d
3+
md5=52ca39a0abd4d0822abdd9e909cc5ffd
4+
cksum=2846116483

‎build/pkgs/ecl/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.12.1.p4
1+
12.12.1.20140409

‎build/pkgs/ecl/patches/gmp.patch

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
diff -druN src.orig/src/configure src/src/configure
2+
--- src.orig/src/configure 2012-12-07 22:01:02.000000000 +0100
3+
+++ src/src/configure 2014-04-09 15:20:21.360905900 +0200
4+
@@ -2544,7 +2544,7 @@
5+
6+
7+
ac_aux_dir=
8+
-for ac_dir in gmp "$srcdir"/gmp; do
9+
+for ac_dir in . "$srcdir"/.; do
10+
if test -f "$ac_dir/install-sh"; then
11+
ac_aux_dir=$ac_dir
12+
ac_install_sh="$ac_aux_dir/install-sh -c"
13+
@@ -2560,7 +2560,7 @@
14+
fi
15+
done
16+
if test -z "$ac_aux_dir"; then
17+
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in gmp \"$srcdir\"/gmp" "$LINENO" 5
18+
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in . \"$srcdir\"/." "$LINENO" 5
19+
fi
20+
21+
# These three variables are undocumented and unsupported,
22+
diff -druN src.orig/src/configure.in src/src/configure.in
23+
--- src.orig/src/configure.in 2012-12-07 22:01:02.000000000 +0100
24+
+++ src/src/configure.in 2014-04-09 15:17:50.282780900 +0200
25+
@@ -11,7 +11,7 @@
26+
AC_INIT([ecl],[12.12.1],[])
27+
AC_REVISION([$Revision$])
28+
AC_CONFIG_SRCDIR([bare.lsp.in])
29+
-AC_CONFIG_AUX_DIR([gmp])
30+
+AC_CONFIG_AUX_DIR([.])
31+
AC_PREREQ(2.59)
32+
33+
dnl -----------------------------------------------------------------------

0 commit comments

Comments
 (0)