Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Configure fixes

  • Loading branch information...
commit ba66726b87cef45fee5a75cbc02dab753756570b 1 parent fbd0ec3
@laurentbartholdi authored
Showing with 15 additions and 4 deletions.
  1. +1 −4 cnf/Makefile.in
  2. +7 −0 cnf/configure.ac
  3. +7 −0 configure
View
5 cnf/Makefile.in
@@ -96,11 +96,8 @@ doc: doc/chap0.html
doc/chap0.html: doc/fr.xml doc/frbib.xml gap/algebra.gd gap/frelement.gd \
gap/group.gd gap/img.gd gap/perlist.gd gap/vector.gd gap/examples.gd \
gap/frmachine.gd gap/helpers.gd gap/mealy.gd gap/trans.gd
- git checkout gh-pages
- git rebase master
echo 'LoadPackage("fr"); DOC@FR();' | $(GAPPROG) -r -q
- git commit -am 'New html files'
- git push
+ (cd doc; git add *.html manual.pdf manual.css; git commit -m 'New html files'; git push github master:gh-pages)
checkblocks:
grep '<#GAPDoc' PackageInfo.g gap/*d | awk -F'"' '{print $$2}' | sort > @@-blocks
View
7 cnf/configure.ac
@@ -116,6 +116,11 @@ EXTERN="\$(CURDIR)/bin/$TARGET/extern"
eval `grep '^GMP_[[A-Z]]*=' "$GAPDIR/bin/$TARGET/config.log"`
+if ! test -f `echo "$GMP_CFLAGS" | cut -c3-`/gmp.h; then # broken install
+ GMP_CFLAGS="-I$GAPDIR/bin/$TARGET/extern/gmp/include"
+ GMP_LIBS="$GAPDIR/bin/$TARGET/extern/gmp/libgmp.a"
+fi
+
AC_ARG_WITH(gmp,
[ --with-gmp=<location>
Location at which the GMP library, needed for MPFR, was installed.
@@ -142,6 +147,8 @@ CPPFLAGS="$CPPFLAGS $GMP_CFLAGS"
GACFLAGS="$GACFLAGS -p $GMP_CFLAGS"
AC_CHECK_HEADER(gmp.h,[],[AC_MSG_ERROR([library gmp not found. Specify its location using --with-gmp])],[])
+echo using gmp.h from `echo "$GMP_CFLAGS" | cut -c3-`
+
AC_SUBST(GMP_CFLAGS)
AC_SUBST(GMP_LDFLAGS)
AC_SUBST(GMP_LIBS)
View
7 configure
@@ -3517,6 +3517,11 @@ EXTERN="\$(CURDIR)/bin/$TARGET/extern"
eval `grep '^GMP_[A-Z]*=' "$GAPDIR/bin/$TARGET/config.log"`
+if ! test -f `echo "$GMP_CFLAGS" | cut -c3-`/gmp.h; then # broken install
+ GMP_CFLAGS="-I$GAPDIR/bin/$TARGET/extern/gmp/include"
+ GMP_LIBS="$GAPDIR/bin/$TARGET/extern/gmp/libgmp.a"
+fi
+
# Check whether --with-gmp was given.
if test "${with_gmp+set}" = set; then :
@@ -3553,6 +3558,8 @@ fi
+echo using gmp.h from `echo "$GMP_CFLAGS" | cut -c3-`
+
Please sign in to comment.
Something went wrong with that request. Please try again.