diff --git a/MAINTENANCE b/MAINTENANCE index a3ff1ec84f4d9fc93b1015432c4d9651eca1a7e3..7a7f21b4bd3cf2846b11982153790fd63ca43ccd 100644 --- a/MAINTENANCE +++ b/MAINTENANCE @@ -5,14 +5,14 @@ dani@mathematik.uni-freiburg.de I) Introduction and Maintenance =============================== -The albert-x.x packages are now distributed using GNU autoconf 2.53, automake 1.6, and libtool 1.4.2. Since some unusual compilation was necessary, a few hints seemed like a good idea. Here is the general structure of the albert-1.1 packages: +The albert-x.x packages are now distributed using GNU autoconf 2.53, automake 1.6, and libtool 1.4.2. Since some unusual compilation was necessary, a few hints seemed like a good idea. Here is the general structure of the albert-1.2 packages: _________ ALBERT/ __________ src/ _______|--- 1d/ / \ |--- 2d/ /__________ BLAS/ -- doc/ |--- 3d/ / |--- Common/ /____________ DEMO/ __ src/ _______|--- 1d/ |--- ALBERT??_??/ -albert-x.x/ * |--- 2d/ +albert-1.2/ * |--- 2d/ \____________ ALBERT_UTIL/ |--- 3d/ \ |--- Common/ \__________ PLOT_ANSI/ __ src/ @@ -34,7 +34,7 @@ The file "configure.ac" is processed by autoconf to create "configure". The scri II) Package contents ==================== -The following subpackages are included in albert-x.x: +The following subpackages are included in albert-1.2: 1) ALBERT The main package. @@ -90,7 +90,7 @@ The next step is to adjust the desired libraries, especially the ALBERT librarie Step 3) Do "[g]make dist" at the top level. -This creates albert-x.x.tar.gz in which all CVS-directories, ~-files, and other unnecessary components are stripped. To be a bit preciser: +This creates albert-1.2.tar.gz in which all CVS-directories, ~-files, and other unnecessary components are stripped. To be a bit preciser: a) All sources and headers are included, of course. diff --git a/README b/README index b9f28ca29ac14cddb92b47d1d19d702792ce64f5..ce6dd18a3a2f60fa9596f27a577cade869cd65c2 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ ALBERT: an Adaptive multi Level finite element toolbox using I) Introduction =============== -This is ALBERT Version 1.1. For the installation process refer to INSTALL. +This is ALBERT Version 1.2. For the installation process refer to INSTALL. Contained in the package are the following subpackages: _________ ALBERT/ __________ src/ _______|--- 1d/ @@ -13,14 +13,14 @@ Contained in the package are the following subpackages: /__________ BLAS/ -- doc/ |--- 3d/ / |--- Common/ /____________ DEMO/ __ src/ _______|--- 1d/ |--- ALBERT??_?/ -albert-1.1/ * |--- 2d/ +albert-1.2/ * |--- 2d/ \____________ ALBERT_UTIL/ |--- 3d/ \ |--- Common/ \__________ PLOT_ANSI/ __ src/ \ \________ SOLVER/ __ src/ \ - \______ [gltools-2-3/] optional + \______ [gltools-2-4/] optional \ \____ configure.ac and other distribution files @@ -58,7 +58,7 @@ The configure file accepts an option called --with-gltools=PATH -where PATH is the path of a gltools-2-3 directory possible installed on the system. The default value where gltools-2-3 is searched is the build directory. +where PATH is the path of a gltools-2-4 directory possible installed on the system. The default value where gltools-2-4 is searched is the build directory. The default installation path is also the build directory. This can be changed via --prefix=PREFIX install architecture-independent files in PREFIX. diff --git a/configure.ac b/configure.ac index 440a8a84e6335a670cc52bb4bcea44bbd538a618..e3344e27a8813024933e29e8c910b2dc203326a9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT([albert], [1.1], [dani@mathematik.uni-freiburg.de]) +AC_INIT([albert], [1.2], [dani@mathematik.uni-freiburg.de]) AC_CONFIG_SRCDIR([ALBERT/src/Common/albert.h]) @@ -42,7 +42,7 @@ AC_PREFIX_DEFAULT([`pwd`]) # Replace `main' with a function in -lm: AC_CHECK_LIB([m],[main],, - [AC_MSG_ERROR([no lm library, exiting...!])] ) + [AC_MSG_ERROR([no math library, exiting...!])] ) AC_CHECK_FUNCS([alarm pow sqrt strdup strchr strstr],, [AC_MSG_ERROR([Sorry, these are needed..])]) @@ -91,10 +91,10 @@ case "$build" in esac case "$build_os" in -*linux*) +*linux*) AC_MSG_RESULT([Building on Linux system...]) AC_CHECK_LIB(g2c, main) AC_CHECK_LIB(blas, main,, - [AC_MSG_WARN([Problems with libblas, also tried lg2c for Linux...]) + [AC_MSG_WARN([Problems with libblas, also tried lg2c...]) make_own_blas_lib=libblas.la], [-lg2c]) AC_CHECK_LIB(X11, main,, @@ -127,26 +127,26 @@ LIBGLTOOLS_PRESENT= AC_MSG_CHECKING([for libgltools.a]) AC_ARG_WITH(gltools, [ --with-gltools=PATH specify the absolute path of the gltools library], -[if test -f $withval/gltools-2-3/libgltools.a; then - AC_MSG_RESULT([Found libgltools.a in specified directory $withval/gltools-2-3.]) - gltools_include="-I$withval/gltools-2-3" +[if test -f $withval/gltools-2-4/libgltools.a; then + AC_MSG_RESULT([Found libgltools.a in specified directory $withval/gltools-2-4.]) + gltools_include="-I$withval/gltools-2-4" AC_DEFINE(HAVE_LIBGLTOOLS,1, - [Define to 1 if you have the `gltools-2-3' library (-lgltools)]) + [Define to 1 if you have the `gltools-2-4' library (-lgltools)]) LIBGLTOOLS_PRESENT=1 - LIBS="-L$withval/gltools-2-3 -lgltools $LIBS" + LIBS="-L$withval/gltools-2-4 -lgltools $LIBS" else - AC_MSG_RESULT([*** No libgltools.a found in $withval/gltools-2-3.]) + AC_MSG_RESULT([*** No libgltools.a found in $withval/gltools-2-4.]) fi], -[if test -f ./gltools-2-3/libgltools.a; then - AC_MSG_RESULT([Found libgltools.a in default directory ./gltools-2-3]) - gltools_include="-I`pwd`/gltools-2-3" +[if test -f ./gltools-2-4/libgltools.a; then + AC_MSG_RESULT([Found libgltools.a in default directory ./gltools-2-4]) + gltools_include="-I`pwd`/gltools-2-4" AC_DEFINE(HAVE_LIBGLTOOLS,1, - [Define to 1 if you have the `gltools-2-3' library (-lgltools)]) + [Define to 1 if you have the `gltools-2-4' library (-lgltools)]) LIBGLTOOLS_PRESENT=1 - LIBS="-L`pwd`/gltools-2-3 -lgltools $LIBS" + LIBS="-L`pwd`/gltools-2-4 -lgltools $LIBS" else - AC_MSG_RESULT([*** No libgltools.a found in ./gltools-2-3]) + AC_MSG_RESULT([*** No libgltools.a found in ./gltools-2-4]) fi]) ELINDEX=