Added sandbox

cnf/Makefile.in

@@ -76,7 +76,7 @@ doc: doc/chap0.html
 
 doc/chap0.html: doc/img.xml doc/imgbib.xml gap/helpers.gd gap/complex.gd
 	echo 'LoadPackage("img"); DOC@IMG();' | @GAP_EXEC@ -r -q
-	(cd doc; git add *.html manual.pdf manual.css; git commit -m 'New html files'; git push github master:gh-pages)
+	(cd doc; git add *.html manual.pdf manual.css; git commit -m 'New html files'; git push github master:gh-pages --force)
 
 checkblocks:
 	grep '<#GAPDoc' PackageInfo.g gap/*d | awk -F'"' '{print $$2}' | sort > @@-blocks
@@ -86,6 +86,7 @@ checkblocks:
 
 tarballs: .version doc
 	mkdir -p www
+	rm -rf www/img
 	tar -c -f - --exclude '*~' --exclude 'config.[ls]*' --exclude 'img/Makefile*' --exclude .cvsignore --exclude autom4te.cache --exclude sandbox --exclude www --exclude bin --exclude 'extern/[a-z]*' --exclude CVS --exclude .version -C .. img | (cd www; tar -x -f -)
 	tar -c -f www/img-`cat .version`.tar.gz -z -C www img
 	ln -sf img-`cat .version`.tar.gz www/img.tar.gz

cnf/aclocal.m4

@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
 
 # Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
@@ -19,8 +19,6 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
@@ -52,8 +50,6 @@ fi])])
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.

cnf/m4/ac_check_cholmod.m4

@@ -36,9 +36,20 @@ if test "$CHOLMODLIB" != ""; then
     LDFLAGS="$LDFLAGS -L$CHOLMODLIB"
     CHOLMOD_LDFLAGS="-L$CHOLMODLIB"
 fi
-AC_CHECK_LIB(cholmod,cholmod_allocate_triplet,,AC_MSG_ERROR([libcholmod not found. Specify its location using --with-cholmod.]),[-llapack -lcolamd -lsuitesparseconfig -lamd -lrt])
 
-CHOLMOD_LIBS="-lcholmod -llapack -lcolamd -lsuitesparseconfig -lamd -lrt"
+CHOLMOD_LIBS=""
+
+for cm_extra in -llapack -lcolamd -lsuitesparseconfig -lamd -lrt; do
+    CHOLMOD_LIBS="$CHOLMOD_LIBS $cm_extra"
+    AC_CHECK_LIB(cholmod,cholmod_allocate_triplet,[cm_found=true],[cm_found=false],[$CHOLMOD_LIBS])
+    if test $cm_found = true; then break; fi
+done
+
+if test $cm_found = false; then
+    AC_MSG_ERROR([libcholmod not found. Specify its location using --with-cholmod.])
+fi
+
+CHOLMOD_LIBS="-lcholmod $CHOLMOD_LIBS"
 
 LIBS="$cm_LIBS"
 AC_SUBST(CHOLMOD_CFLAGS)

configure

@@ -592,7 +592,7 @@ PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 PACKAGE_URL=
 
-ac_unique_file="fr"
+ac_unique_file="img"
 ac_unique_file="src/img_dll.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -16108,7 +16108,6 @@ fi
 fi
 
 
-
 # Checks for header files.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
@@ -16883,13 +16882,18 @@ if test "$CHOLMODLIB" != ""; then
     LDFLAGS="$LDFLAGS -L$CHOLMODLIB"
     CHOLMOD_LDFLAGS="-L$CHOLMODLIB"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cholmod_allocate_triplet in -lcholmod" >&5
+
+CHOLMOD_LIBS=""
+
+for cm_extra in -llapack -lcolamd -lsuitesparseconfig -lamd -lrt; do
+    CHOLMOD_LIBS="$CHOLMOD_LIBS $cm_extra"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cholmod_allocate_triplet in -lcholmod" >&5
 $as_echo_n "checking for cholmod_allocate_triplet in -lcholmod... " >&6; }
 if ${ac_cv_lib_cholmod_cholmod_allocate_triplet+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcholmod -llapack -lcolamd -lsuitesparseconfig -lamd -lrt $LIBS"
+LIBS="-lcholmod $CHOLMOD_LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16920,18 +16924,19 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cholmod_cholmod_allocate_triplet" >&5
 $as_echo "$ac_cv_lib_cholmod_cholmod_allocate_triplet" >&6; }
 if test "x$ac_cv_lib_cholmod_cholmod_allocate_triplet" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCHOLMOD 1
-_ACEOF
-
-  LIBS="-lcholmod $LIBS"
-
+  cm_found=true
 else
-  as_fn_error $? "libcholmod not found. Specify its location using --with-cholmod." "$LINENO" 5
+  cm_found=false
 fi
 
+    if test $cm_found = true; then break; fi
+done
+
+if test $cm_found = false; then
+    as_fn_error $? "libcholmod not found. Specify its location using --with-cholmod." "$LINENO" 5
+fi
 
-CHOLMOD_LIBS="-lcholmod -llapack -lcolamd -lsuitesparseconfig -lamd -lrt"
+CHOLMOD_LIBS="-lcholmod $CHOLMOD_LIBS"
 
 LIBS="$cm_LIBS"