From 5a7b8186bbb729d5e1fcc162db47b1ab2da70332 Mon Sep 17 00:00:00 2001
From: Claus-Justus Heine <Claus-Justus.Heine@IANS.Uni-Stuttgart.DE>
Date: Wed, 10 Sep 2003 15:53:25 +0000
Subject: [PATCH] First step in ALBERT becoming femail.
---
.cvsignore | 2 +-
AUTHORS | 4 +-
MAINTENANCE | 80 +++++++++++++-------------
Makefile.am | 10 ++--
NEWS | 2 +-
README | 36 ++++++------
configure.ac | 64 ++++++++++-----------
gnu-compat/Makefile.am | 6 +-
m4/albert-check.m4 | 126 ++++++++++++++++++++---------------------
m4/check-albert-qgl.m4 | 20 +++----
m4/check-package.m4 | 12 ++--
m4/check-qt.m4 | 4 +-
m4/type-sizes.m4 | 2 +-
13 files changed, 184 insertions(+), 184 deletions(-)
diff --git a/.cvsignore b/.cvsignore
index 19e1845..afdcb7b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,7 +1,7 @@
Makefile
Makefile.in
aclocal.m4
-albert-*.tar.gz
+alberta-*.tar.gz
autom4te.cache
bin
config.cache
diff --git a/AUTHORS b/AUTHORS
index 3876dc9..e57259a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,8 +1,8 @@
-ALBERT: an Adaptive multi Level finite element toolbox using
+ALBERTA: an Adaptive multi Level finite element toolbox using
Bisectioning refinement and Error control by Residual
Techniques
-http://www.mathematik.uni-freiburg.de/IAM/ALBERT
+http://www.mathematik.uni-freiburg.de/IAM/ALBERTA
authors: Alfred Schmidt
diff --git a/MAINTENANCE b/MAINTENANCE
index 8227141..0f73d00 100644
--- a/MAINTENANCE
+++ b/MAINTENANCE
@@ -1,19 +1,19 @@
-MAINTENANCE DOCUMENTATION FOR ALBERT PACKAGES
+MAINTENANCE DOCUMENTATION FOR ALBERTA PACKAGES
Daniel Koester, December 2002
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.2 packages:
+The alberta-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 alberta-1.2 packages:
- __________ ALBERT/ __________ src/ _______|--- 1d/
+ __________ ALBERTA/ __________ src/ _______|--- 1d/
/ \ |--- 2d/
/___________ BLAS/ -- doc/ |--- 3d/
/ |--- Common/
- /_____________ DEMO/ __ src/ _______|--- 1d/ |--- ALBERT??_?/
-albert-1.2/ * |--- 2d/
- \_____________ ALBERT_UTIL/ |--- 3d/
+ /_____________ DEMO/ __ src/ _______|--- 1d/ |--- ALBERTA??_?/
+alberta-1.2/ * |--- 2d/
+ \_____________ ALBERTA_UTIL/ |--- 3d/
\ |--- Common/
\___________ PLOT_ANSI/ __ src/
\
@@ -34,14 +34,14 @@ to create "Makefile.in"s. Two exceptions:
1) The "Makefile.in"s in DEMO/src/*d are independently maintained. They have a
simple structure compared to "real" "Makefile.in"s produced by automake.
-2) The "Makefile.albert.in" in ALBERT/src/Common/, see below.
+2) The "Makefile.alberta.in" in ALBERTA/src/Common/, see below.
The file "configure.ac" is processed by autoconf to create "configure". The
script "configure" then processes "Makefile.in"s to create proper
Makefiles. The created Makefiles can then be used by us to test compilation
and the demo programs. All Makefiles can be called independently from any
subdirectory. The "install"-target is used to install a package (defaults
-for maintenance: albert-x.x/lib/ and albert-x.x/include/ as installation
+for maintenance: alberta-x.x/lib/ and alberta-x.x/include/ as installation
paths for libraries and headers, no shared libraries). There are also
several variations of "clean" targets.
@@ -49,43 +49,43 @@ several variations of "clean" targets.
II) Package contents
====================
-The following subpackages are included in albert-1.2:
-1) ALBERT
+The following subpackages are included in alberta-1.2:
+1) ALBERTA
The main package.
2) BLAS
Basic Linear Algebra Subroutines, these are compiled if the system on which
-ALBERT will run does not supply them.
+ALBERTA will run does not supply them.
3) DEMO
A few demonstration programs. This package is not touched by automake and
includes several small Makefile.in's in which configure substitutes values
like installation paths for libraries and headers. This directory can be
copied elsewhere by the user after installation. The Makefiles include
-"Makefile.albert" which resides in $installdir/include together with the
-C-header files. They are meant to faciliate the first steps with ALBERT.
+"Makefile.alberta" which resides in $installdir/include together with the
+C-header files. They are meant to faciliate the first steps with ALBERTA.
-4) ALBERT_UTIL
-This package contains the old ALBERT util.c file, now split into several
+4) ALBERTA_UTIL
+This package contains the old ALBERTA util.c file, now split into several
smaller source files. It is compiled to form a separate utility library
-(message macros, ALBERT memory allocation routines, etc.) and should linked
-to any program using the ALBERT package.
+(message macros, ALBERTA memory allocation routines, etc.) and should linked
+to any program using the ALBERTA package.
It can also be used as a standalone utility library.
5) PLOT_ANSI
PLOT_ANSI provides tools for displaying X11 graphics, if gltools is not used.
6) SOLVER
-Linear and nonlinear solver routines for ALBERT.
+Linear and nonlinear solver routines for ALBERTA.
7) GRAPE
-GRAPE interface for ALBERT
+GRAPE interface for ALBERTA
III) External packages
======================
-The gltools package is not part of ALBERT. If it is detected during
-installation, the file ALBERT/src/Common/gltools.c is included in the ALBERT
+The gltools package is not part of ALBERTA. If it is detected during
+installation, the file ALBERTA/src/Common/gltools.c is included in the ALBERTA
libraries. The user can specify the path of an already installed
gltools-package as a configure option, see INSTALL.
@@ -116,7 +116,7 @@ Step 0a)
Step 1)
Do [g]make clean cvs-clean. This deletes all files which are not part of the
CVS directory tree, but are in the CVS-maintained directories. Also does
- "chgrp -R albert *"
+ "chgrp -R alberta *"
Step 2)
cvs commit
@@ -161,12 +161,12 @@ Another possibility (avoiding Step 1) from above) is the following:
Then run cvs like follows:
- cvs -d :ext:USER@COMPUTER.mathematik.uni-freiburg.de:/net/sauron/graid/ALBERT_CVS/ commit FILE1 ... FILEN
+ cvs -d :ext:USER@COMPUTER.mathematik.uni-freiburg.de:/net/sauron/graid/ALBERTA_CVS/ commit FILE1 ... FILEN
This will take care of setting the correct permissions and group id's in
- the ALBERT CVS repository. It will fail if you are not a member of the
- access group "albert", but then you shouldn't attempt to commit changes
- at all, ask one of the ALBERT maintainers for help.
+ the ALBERTA CVS repository. It will fail if you are not a member of the
+ access group "alberta", but then you shouldn't attempt to commit changes
+ at all, ask one of the ALBERTA maintainers for help.
V) How to create a distribution
===============================
@@ -175,49 +175,49 @@ Step 0)
Become familiar with CVS.
Step 1)
-At the moment, the subpackages ALBERT, BLAS, DEMO, ALBERT_UTIL, PLOT_ANSI,
+At the moment, the subpackages ALBERTA, BLAS, DEMO, ALBERTA_UTIL, PLOT_ANSI,
GRAPE and SOLVER are maintained using the version control system CVS. To
prepare a distribution, one must first check out the distribution version of
-these packages. To this aim there exists an "albertdist" module. Checking it
-out will create the ALBERT package with the directory structure describe
+these packages. To this aim there exists an "albertadist" module. Checking it
+out will create the ALBERTA package with the directory structure describe
right at the beginning of this file.
- cvs co albertdist
+ cvs co albertadist
also checks out CVS administration directories in each module. This is ok,
since Makefiles produced by configure have a fixed set of directories to be
included in a distribution. Another possibility is
- cvs export albertdist
+ cvs export albertadist
which strips the CVS directories.
Actually, when making a _real_ distribution (i.e. you are not only playing
with "make dist", you should set a symbolic tag with cvs _first_, e.g.
- cvs rtag ALBERT_2_0 abertdist
+ cvs rtag ALBERTA_2_0 abertdist
-Afterwards, check out _that_ version of ALBERT
+Afterwards, check out _that_ version of ALBERTA
- cvs co -r ALBERT_2_0 albertdist
+ cvs co -r ALBERTA_2_0 albertadist
Step 2)
-The next step is to adjust the desired libraries, especially the ALBERT
-libraries. Each ALBERT library has its own directory of the form
-"ALBERT[DIM][DIM_OF_WORLD]_[DEBUG=0 or 1][EL_INDEX=nothing or 1]" since
+The next step is to adjust the desired libraries, especially the ALBERTA
+libraries. Each ALBERTA library has its own directory of the form
+"ALBERTA[DIM][DIM_OF_WORLD]_[DEBUG=0 or 1][EL_INDEX=nothing or 1]" since
compilation is different for each library version. If these settings are to
-be changed, make a new directory (as in ALBERT13_0[1]) for example, create a
+be changed, make a new directory (as in ALBERTA13_0[1]) for example, create a
copy of the Makefile.am from another directory and adjust the obvious
settings like "DIM", "DIM_OF_WORLD", etc. The Makefile.am in these
directories uses VPATH to find sources in src/?d and src/Common.
Step 3a)
Make sure you have a recent version of GNU automake, autoconf and libtool
-and run "autoreconf" in the "albertdist" directory.
+and run "autoreconf" in the "albertadist" directory.
Step 3)
Do "[g]make dist" at the top level.
-This creates albert-1.2.tar.gz in which all CVS-directories, ~-files, and
+This creates alberta-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/Makefile.am b/Makefile.am
index 499f066..cf4a975 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
if GRAPE
- SUBDIRS = gnu-compat BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT GRAPE
+ SUBDIRS = gnu-compat BLAS ALBERTA_UTIL SOLVER PLOT_ANSI ALBERTA GRAPE
else
- SUBDIRS = gnu-compat BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT
+ SUBDIRS = gnu-compat BLAS ALBERTA_UTIL SOLVER PLOT_ANSI ALBERTA
endif
ACLOCAL_AMFLAGS = -I ./m4
@@ -13,8 +13,8 @@ if MAINTAINER_MODE
cvs-clean:
@echo Fixing package for cvs commit...
find . -name \*~ -exec rm -rf {} \;
- find ./ALBERT ./BLAS ./ALBERT_UTIL ./PLOT_ANSI ./SOLVER -name Makefile.in -exec rm -rf {} \;
- find ./DEMO ./ALBERT ./BLAS ./ALBERT_UTIL ./PLOT_ANSI ./SOLVER -name Makefile -exec rm -rf {} \;
+ find ./ALBERTA ./BLAS ./ALBERTA_UTIL ./PLOT_ANSI ./SOLVER -name Makefile.in -exec rm -rf {} \;
+ find ./DEMO ./ALBERTA ./BLAS ./ALBERTA_UTIL ./PLOT_ANSI ./SOLVER -name Makefile -exec rm -rf {} \;
find ./DEMO \( -name \*~ -o -name \*.o -o -name \*.lo \) -exec /bin/rm -f {} \;
find ./DEMO \( -name ellipt -o -name heat -o -name nonlin \) -exec /bin/rm -f {} \;
find ./DEMO -name Makefile -exec /bin/rm -f {} \;
@@ -28,7 +28,7 @@ cvs-clean:
cp -f NEWS admin/
cp -f README admin/
cp -f INSTALL admin/
- chgrp -R albert *
+ chgrp -R alberta *
dist-hook:
@echo Deleting CVS directories in $(distdir)
diff --git a/NEWS b/NEWS
index 7eaa908..69db5a9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
2003-070-02
- ALBERT 1.2 -- not yet released
+ ALBERTA 1.2 -- not yet released
New features: mixed methods
diff --git a/README b/README
index 05778cd..0417322 100644
--- a/README
+++ b/README
@@ -1,20 +1,20 @@
-ALBERT: an Adaptive multi Level finite element toolbox using
+ALBERTA: an Adaptive multi Level finite element toolbox using
Bisectioning refinement and Error control by Residual
Techniques
I) Introduction
===============
-This is ALBERT Version 1.2. For the installation process refer to INSTALL.
+This is ALBERTA Version 1.2. For the installation process refer to INSTALL.
Contained in the package are the following subpackages:
- __________ ALBERT/ __________ src/ _______|--- 1d/
+ __________ ALBERTA/ __________ src/ _______|--- 1d/
/ \ |--- 2d/
/___________ BLAS/ -- doc/ |--- 3d/
/ |--- Common/
- /_____________ DEMO/ __ src/ _______|--- 1d/ |--- ALBERT??_?/
-albert-1.2/ * |--- 2d/
- \_____________ ALBERT_UTIL/ |--- 3d/
+ /_____________ DEMO/ __ src/ _______|--- 1d/ |--- ALBERTA??_?/
+alberta-1.2/ * |--- 2d/
+ \_____________ ALBERTA_UTIL/ |--- 3d/
\ |--- Common/
\___________ PLOT_ANSI/ __ src/
\
@@ -29,28 +29,28 @@ albert-1.2/ * |--- 2d/
\_ configure.ac and other distribution
files
-1) ALBERT
+1) ALBERTA
The main package.
2) BLAS
-Basic Linear Algebra Subroutines, these are compiled if the system on which ALBERT will run does not supply them.
+Basic Linear Algebra Subroutines, these are compiled if the system on which ALBERTA will run does not supply them.
3) DEMO
-A few demonstration programs. This subpackage includes several small Makefile.in's in which configure substitutes values like installation paths for libraries and headers. This directory can be copied elsewhere by the user after installation. The Makefiles include "Makefile.albert" which resides in $installdir/include together with the C-header files. They are meant to faciliate the first steps with ALBERT.
+A few demonstration programs. This subpackage includes several small Makefile.in's in which configure substitutes values like installation paths for libraries and headers. This directory can be copied elsewhere by the user after installation. The Makefiles include "Makefile.alberta" which resides in $installdir/include together with the C-header files. They are meant to faciliate the first steps with ALBERTA.
-4) ALBERT_UTIL
-This package contains the old ALBERT util.c file, now split into several smaller source files. It is compiled to form a separate utility library (message macros, ALBERT memory allocation routines, etc.) and should linked to any program using the ALBERT package.
+4) ALBERTA_UTIL
+This package contains the old ALBERTA util.c file, now split into several smaller source files. It is compiled to form a separate utility library (message macros, ALBERTA memory allocation routines, etc.) and should linked to any program using the ALBERTA package.
It can also be used as a standalone utility library.
5) PLOT_ANSI
PLOT_ANSI provides tools for displaying X11 graphics, if gltools is not used.
6) SOLVER
-Linear and nonlinear solver routines for ALBERT.
+Linear and nonlinear solver routines for ALBERTA.
7) GRAPE
-GRAPE interface for ALBERT. Only for non-parametric FE of dimension 2 and 3.
-"make" will create "albert_grapeXX" and albert_moviXX" where XX is in {22, 33}.
+GRAPE interface for ALBERTA. Only for non-parametric FE of dimension 2 and 3.
+"make" will create "alberta_grapeXX" and alberta_moviXX" where XX is in {22, 33}.
"make install" will install those programs below PREFIX/bin.
The GRAPE interface is only installed when the GRAPE library and header file
@@ -60,7 +60,7 @@ are available on your system (determined at configure time, use
II) External packages
=====================
-The gltools package is not part of ALBERT. If it is detected during installation, the file ALBERT/src/Common/gltools.c is included in the ALBERT libraries. The user can specify the path of an already installed gltools-package as a configure option, see below.
+The gltools package is not part of ALBERTA. If it is detected during installation, the file ALBERTA/src/Common/gltools.c is included in the ALBERTA libraries. The user can specify the path of an already installed gltools-package as a configure option, see below.
III) Configure options
@@ -70,7 +70,7 @@ III) Configure options
"INSTALL" contains generic configuration instructions and a description of
generic command line options for configure.
-The remaining (i.e. ALBERT specific) options are explained here:
+The remaining (i.e. ALBERTA specific) options are explained here:
--with-gltools=PATH
PATH is the path of a gltools-2-4 directory possible installed
@@ -88,8 +88,8 @@ The remaining (i.e. ALBERT specific) options are explained here:
where ?? is "yes" or "no".
--enable-el_index
- builds versions of the ALBERT libraries with C Preprocessor
- macro "EL_INDEX" set to 1. See the ALBERT documentation for
+ builds versions of the ALBERTA libraries with C Preprocessor
+ macro "EL_INDEX" set to 1. See the ALBERTA documentation for
details.
--without-GRAPE
diff --git a/configure.ac b/configure.ac
index f58a439..91a6fce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT([albert], [1.2-pre2], [dani@mathematik.uni-freiburg.de])
+AC_INIT([alberta], [1.2-pre2], [dani@mathematik.uni-freiburg.de])
-AC_CONFIG_SRCDIR([ALBERT/src/Common/albert.h])
+AC_CONFIG_SRCDIR([ALBERTA/src/Common/alberta.h])
AM_MAINTAINER_MODE
-AC_CONFIG_FILES([Makefile BLAS/Makefile ALBERT_UTIL/Makefile
+AC_CONFIG_FILES([Makefile BLAS/Makefile ALBERTA_UTIL/Makefile
gnu-compat/Makefile
GRAPE/Makefile GRAPE/mesh/Makefile
GRAPE/mesh/2d/Makefile
@@ -16,18 +16,18 @@ AC_CONFIG_FILES([Makefile BLAS/Makefile ALBERT_UTIL/Makefile
PLOT_ANSI/Makefile PLOT_ANSI/src/Makefile
DEMO/src/Makefile
DEMO/src/1d/Makefile DEMO/src/2d/Makefile DEMO/src/3d/Makefile
- ALBERT/Makefile ALBERT/src/Makefile
- ALBERT/src/ALBERT11_0/Makefile ALBERT/src/ALBERT11_1/Makefile
- ALBERT/src/ALBERT12_0/Makefile ALBERT/src/ALBERT12_1/Makefile
- ALBERT/src/ALBERT22_0/Makefile ALBERT/src/ALBERT22_1/Makefile
- ALBERT/src/ALBERT23_0/Makefile ALBERT/src/ALBERT23_1/Makefile
- ALBERT/src/ALBERT33_0/Makefile ALBERT/src/ALBERT33_1/Makefile
- ALBERT/src/ALBERT11_01/Makefile ALBERT/src/ALBERT11_11/Makefile
- ALBERT/src/ALBERT12_01/Makefile ALBERT/src/ALBERT12_11/Makefile
- ALBERT/src/ALBERT22_01/Makefile ALBERT/src/ALBERT22_11/Makefile
- ALBERT/src/ALBERT23_01/Makefile ALBERT/src/ALBERT23_11/Makefile
- ALBERT/src/ALBERT33_01/Makefile ALBERT/src/ALBERT33_11/Makefile
- ALBERT/src/Common/Makefile ALBERT/src/Common/Makefile.albert])
+ ALBERTA/Makefile ALBERTA/src/Makefile
+ ALBERTA/src/ALBERTA11_0/Makefile ALBERTA/src/ALBERTA11_1/Makefile
+ ALBERTA/src/ALBERTA12_0/Makefile ALBERTA/src/ALBERTA12_1/Makefile
+ ALBERTA/src/ALBERTA22_0/Makefile ALBERTA/src/ALBERTA22_1/Makefile
+ ALBERTA/src/ALBERTA23_0/Makefile ALBERTA/src/ALBERTA23_1/Makefile
+ ALBERTA/src/ALBERTA33_0/Makefile ALBERTA/src/ALBERTA33_1/Makefile
+ ALBERTA/src/ALBERTA11_01/Makefile ALBERTA/src/ALBERTA11_11/Makefile
+ ALBERTA/src/ALBERTA12_01/Makefile ALBERTA/src/ALBERTA12_11/Makefile
+ ALBERTA/src/ALBERTA22_01/Makefile ALBERTA/src/ALBERTA22_11/Makefile
+ ALBERTA/src/ALBERTA23_01/Makefile ALBERTA/src/ALBERTA23_11/Makefile
+ ALBERTA/src/ALBERTA33_01/Makefile ALBERTA/src/ALBERTA33_11/Makefile
+ ALBERTA/src/Common/Makefile ALBERTA/src/Common/Makefile.alberta])
AM_INIT_AUTOMAKE([1.6])
@@ -59,11 +59,11 @@ fi
AC_PREFIX_DEFAULT([`pwd`])
if test "$GCC" = yes; then
- ALBERT_DEBUG_CFLAGS="-ggdb -fno-inline -fno-builtin"
+ ALBERTA_DEBUG_CFLAGS="-ggdb -fno-inline -fno-builtin"
else
- ALBERT_DEBUG_CFLAGS="-g"
+ ALBERTA_DEBUG_CFLAGS="-g"
fi
-AC_SUBST(ALBERT_DEBUG_CFLAGS)
+AC_SUBST(ALBERTA_DEBUG_CFLAGS)
# Checks for libraries.
@@ -185,28 +185,28 @@ else
fi])
dnl
-dnl some defines to enable building of albert_movi
+dnl some defines to enable building of alberta_movi
dnl
-ALBERT_CHECK_PACKAGE(GRAPE, gr, , ${X_LIBS} -lX11, grape.h,, optional)
+ALBERTA_CHECK_PACKAGE(GRAPE, gr, , ${X_LIBS} -lX11, grape.h,, optional)
AM_CONDITIONAL(GRAPE, test -n "${GRAPE_LIB}")
-ALBERT_LIB_PATH=$prefix/lib
-ALBERT_INCLUDE_PATH='$(top_srcdir)/ALBERT/src/Common/ -I$(top_srcdir)/ALBERT_UTIL'
-ALBERT_LIBS_22='$(top_builddir)/ALBERT/src/ALBERT22_0/libALBERT22_0.la $(top_builddir)/SOLVER/src/libcsolver.la $(top_builddir)/ALBERT_UTIL/libalbert_util.la $(top_builddir)/PLOT_ANSI/src/libPLOTansi.la'
-ALBERT_LIBS_33='$(top_builddir)/ALBERT/src/ALBERT33_0/libALBERT33_0.la $(top_builddir)/SOLVER/src/libcsolver.la $(top_builddir)/ALBERT_UTIL/libalbert_util.la'
-ALBERT_DEBUG=
-AC_SUBST(ALBERT_DEBUG)
-AC_SUBST(ALBERT_LIB_PATH)
-AC_SUBST(ALBERT_INCLUDE_PATH)
-AC_SUBST(ALBERT_LIBS_22)
-AC_SUBST(ALBERT_LIBS_33)
+ALBERTA_LIB_PATH=$prefix/lib
+ALBERTA_INCLUDE_PATH='$(top_srcdir)/ALBERTA/src/Common/ -I$(top_srcdir)/ALBERTA_UTIL'
+ALBERTA_LIBS_22='$(top_builddir)/ALBERTA/src/ALBERTA22_0/libALBERTA22_0.la $(top_builddir)/SOLVER/src/libcsolver.la $(top_builddir)/ALBERTA_UTIL/libalberta_util.la $(top_builddir)/PLOT_ANSI/src/libPLOTansi.la'
+ALBERTA_LIBS_33='$(top_builddir)/ALBERTA/src/ALBERTA33_0/libALBERTA33_0.la $(top_builddir)/SOLVER/src/libcsolver.la $(top_builddir)/ALBERTA_UTIL/libalberta_util.la'
+ALBERTA_DEBUG=
+AC_SUBST(ALBERTA_DEBUG)
+AC_SUBST(ALBERTA_LIB_PATH)
+AC_SUBST(ALBERTA_INCLUDE_PATH)
+AC_SUBST(ALBERTA_LIBS_22)
+AC_SUBST(ALBERTA_LIBS_33)
dnl
-dnl end of albert_movi
+dnl end of alberta_movi
dnl
EL_INDEX=0
AC_ARG_ENABLE(el_index,
AC_HELP_STRING([--enable-el_index],
- [also build a version of ALBERT libraries using EL_INDEX=1 (default is off)]),
+ [also build a version of ALBERTA libraries using EL_INDEX=1 (default is off)]),
[EL_INDEX=1])
AC_SUBST(EL_INDEX)
diff --git a/gnu-compat/Makefile.am b/gnu-compat/Makefile.am
index e85bcc5..025a31c 100644
--- a/gnu-compat/Makefile.am
+++ b/gnu-compat/Makefile.am
@@ -1,8 +1,8 @@
EXTRADIST = README COPYING
-noinst_LTLIBRARIES = libalbertgnucompat.la
+noinst_LTLIBRARIES = libalbertagnucompat.la
noinst_HEADERS = getopt.h
-libalbertgnucompat_la_SOURCES = getopt.h
-libalbertgnucompat_la_LIBADD = @LTLIBOBJS@
+libalbertagnucompat_la_SOURCES = getopt.h
+libalbertagnucompat_la_LIBADD = @LTLIBOBJS@
diff --git a/m4/albert-check.m4 b/m4/albert-check.m4
index ca26a8b..9442965 100644
--- a/m4/albert-check.m4
+++ b/m4/albert-check.m4
@@ -1,10 +1,10 @@
dnl
-dnl Define this outside ALBERT_CHECK() so that it can be AC_REQUIRE'd
+dnl Define this outside ALBERTA_CHECK() so that it can be AC_REQUIRE'd
dnl
-AC_DEFUN([ALBERT_OPTIONS],
+AC_DEFUN([ALBERTA_OPTIONS],
[
AC_ARG_ENABLE(el_index,
-[ --enable-el_index use an EL_INDEX enabled version of the ALBERT
+[ --enable-el_index use an EL_INDEX enabled version of the ALBERTA
libraries (default is off)],
[ELINDEX=1],
ELINDEX=)
@@ -12,23 +12,23 @@ EL_INDEX=${ELINDEX:-0}
AC_SUBST([EL_INDEX])
dnl
AC_ARG_ENABLE(debug,
-[ --enable-debug use debug-enabled ALBERT libraries (default: off)],
-[ALBERT_DEBUG=1],
-ALBERT_DEBUG=0)
-AC_SUBST([ALBERT_DEBUG])
+[ --enable-debug use debug-enabled ALBERTA libraries (default: off)],
+[ALBERTA_DEBUG=1],
+ALBERTA_DEBUG=0)
+AC_SUBST([ALBERTA_DEBUG])
])
dnl
dnl check for possiby needed packages, DEFUN for AC_REQUIRE
dnl
-AC_DEFUN([ALBERT_AUX_CHECK],
+AC_DEFUN([ALBERTA_AUX_CHECK],
[AC_REQUIRE([AC_PATH_X])
AC_REQUIRE([AC_PATH_XTRA])
-ALBERT_CHECK_PACKAGE(OpenGL, GL, ${x_libraries}, ${X_LIBS} -lX11,
+ALBERTA_CHECK_PACKAGE(OpenGL, GL, ${x_libraries}, ${X_LIBS} -lX11,
gl.h, ${x_includes}/GL , optional)
-ALBERT_CHECK_PACKAGE(PLOT, PLOTansi, $ALBERT_LIB_PATH, $OpenGL_LIB,
- PLOTansi.h, $ALBERT_INCLUDE_PATH, optional)
-ALBERT_CHECK_PACKAGE(gltools, gltools,, $OpenGL_LIB,
+ALBERTA_CHECK_PACKAGE(PLOT, PLOTansi, $ALBERTA_LIB_PATH, $OpenGL_LIB,
+ PLOTansi.h, $ALBERTA_INCLUDE_PATH, optional)
+ALBERTA_CHECK_PACKAGE(gltools, gltools,, $OpenGL_LIB,
glwin.h,, optional)
AC_LANG_PUSH(Fortran 77)
AC_CHECK_LIB(blas, dnrm2,
@@ -36,107 +36,107 @@ AC_CHECK_LIB(blas, dnrm2,
AC_DEFINE(HAVE_LIBBLAS, 1, [Define to 1 if you have libblas])],
[AC_MSG_ERROR([Required BLAS library was not found])])
AC_LANG_POP(Fortran 77)
-ALBERT_CHECK_PACKAGE(albert_util, albert_util, $ALBERT_LIB_PATH, -lm,
- albert_util.h, $ALBERT_INCLUDE_PATH, required)
-ALBERT_CHECK_PACKAGE(csolver, csolver, $ALBERT_LIB_PATH,
- ${FLIBS} -lalbert_util -lm,
- oem.h, $ALBERT_INCLUDE_PATH, required)
+ALBERTA_CHECK_PACKAGE(alberta_util, alberta_util, $ALBERTA_LIB_PATH, -lm,
+ alberta_util.h, $ALBERTA_INCLUDE_PATH, required)
+ALBERTA_CHECK_PACKAGE(csolver, csolver, $ALBERTA_LIB_PATH,
+ ${FLIBS} -lalberta_util -lm,
+ oem.h, $ALBERTA_INCLUDE_PATH, required)
])
dnl
-dnl Check for ALBERT libraries at given dimensions, taking ELINDEX and DEBUG
+dnl Check for ALBERTA libraries at given dimensions, taking ELINDEX and DEBUG
dnl into account. $1 is DIM, $2 ist DIM_OF_WORLD
dnl
-AC_DEFUN([ALBERT_CHECK],
-[AC_REQUIRE([ALBERT_TYPE_SIZES])
-AC_REQUIRE([ALBERT_OPTIONS])
+AC_DEFUN([ALBERTA_CHECK],
+[AC_REQUIRE([ALBERTA_TYPE_SIZES])
+AC_REQUIRE([ALBERTA_OPTIONS])
AC_REQUIRE([AC_SET_PREFIX])
dnl
dnl library location
dnl
-AC_ARG_WITH(albert-libs,
-[ --with-albert-libs=LOCATION use ALBERT libraries installed below LOCATION.
+AC_ARG_WITH(alberta-libs,
+[ --with-alberta-libs=LOCATION use ALBERTA libraries installed below LOCATION.
The library is expected under "LOCATION/".
Default is the value of the environment variable
- ALBERT_LIB_PATH, if set, otherwise 'PREFIX/lib'],
+ ALBERTA_LIB_PATH, if set, otherwise 'PREFIX/lib'],
[case "$withval" in
yes|no)
;;
- *) ALBERT_LIB_PATH=${withval}
+ *) ALBERTA_LIB_PATH=${withval}
;;
esac],
-[if test "x$ALBERT_LIB_PATH" = "x" ; then
- ALBERT_LIB_PATH=`eval eval echo ${libdir}`
+[if test "x$ALBERTA_LIB_PATH" = "x" ; then
+ ALBERTA_LIB_PATH=`eval eval echo ${libdir}`
fi])
-AC_SUBST(ALBERT_LIB_PATH)
+AC_SUBST(ALBERTA_LIB_PATH)
dnl
dnl next for headers
dnl
-AC_ARG_WITH(albert-includes,
-[ --with-albert-includes=LOCATION use ALBERT includes installed below
+AC_ARG_WITH(alberta-includes,
+[ --with-alberta-includes=LOCATION use ALBERTA includes installed below
LOCATION. Default is the value of the environment
- variable ALBERT_INCLUDE_PATH, if set, otherwise
+ variable ALBERTA_INCLUDE_PATH, if set, otherwise
'PREFIX/include'],
[case "$withval" in
yes|no)
;;
- *) ALBERT_INCLUDE_PATH=${withval}
+ *) ALBERTA_INCLUDE_PATH=${withval}
;;
esac],
-[if test "x$ALBERT_INCLUDE_PATH" = "x" ; then
- ALBERT_INCLUDE_PATH=`eval eval echo ${includedir}`
+[if test "x$ALBERTA_INCLUDE_PATH" = "x" ; then
+ ALBERTA_INCLUDE_PATH=`eval eval echo ${includedir}`
fi])
-AC_SUBST(ALBERT_INCLUDE_PATH)
+AC_SUBST(ALBERTA_INCLUDE_PATH)
dnl
dnl Now check for the library. Take into account that we might need
dnl gltools and PLOTansi
dnl
-AC_REQUIRE([ALBERT_AUX_CHECK])
+AC_REQUIRE([ALBERTA_AUX_CHECK])
dnl
-dnl Now check for libALBERT_XXX itself
+dnl Now check for libALBERTA_XXX itself
dnl
-ALBERT_LIB_$1$2=ALBERT$1$2_${ALBERT_DEBUG}${ELINDEX}
-ALBERT_LIB_$1$2_C=ac_cv_lib_ALBERT$1$2_${ALBERT_DEBUG}${ELINDEX}
+ALBERTA_LIB_$1$2=ALBERTA$1$2_${ALBERTA_DEBUG}${ELINDEX}
+ALBERTA_LIB_$1$2_C=ac_cv_lib_ALBERTA$1$2_${ALBERTA_DEBUG}${ELINDEX}
AC_CACHE_CHECK([for additional libraries needed to link],
- [ac_cv_libalbert$1$2_gfxlibs],
- [ac_cv_libalbert$1$2_gfxlibs=unset
+ [ac_cv_libalberta$1$2_gfxlibs],
+ [ac_cv_libalberta$1$2_gfxlibs=unset
for GFX_LIBS in "" \
"$OpenGL_LIB ${X_LIBS} -lX11" \
"$gltools_LIB $OpenGL_LIB ${X_LIBS} -lX11" \
"$PLOT_LIB $OpenGL_LIB ${X_LIBS} -lX11" \
"$gltools_LIB $PLOT_LIB $OpenGL_LIB ${X_LIBS} -lX11"
do
- eval "unset ${ALBERT_LIB_$1$2_C}___main"
- AC_CHECK_LIB($ALBERT_LIB_$1$2, main,
- [ac_cv_libalbert$1$2_gfxlibs="$GFX_LIBS"
+ eval "unset ${ALBERTA_LIB_$1$2_C}___main"
+ AC_CHECK_LIB($ALBERTA_LIB_$1$2, main,
+ [ac_cv_libalberta$1$2_gfxlibs="$GFX_LIBS"
break],,
[$csolver_LIB $GFX_LIBS])
done])
-if test "$ac_cv_libalbert$1$2_gfxlibs" = unset; then
- AC_MSG_ERROR([Unable to link a program with lib$ALBERT_LIB_$1$2!])
+if test "$ac_cv_libalberta$1$2_gfxlibs" = unset; then
+ AC_MSG_ERROR([Unable to link a program with lib$ALBERTA_LIB_$1$2!])
else
- ALBERT_LIBS_$1$2="-L$ALBERT_LIB_PATH -l$ALBERT_LIB_$1$2 $csolver_LIB $ac_cv_libalbert$1$2_gfxlibs"
+ ALBERTA_LIBS_$1$2="-L$ALBERTA_LIB_PATH -l$ALBERTA_LIB_$1$2 $csolver_LIB $ac_cv_libalberta$1$2_gfxlibs"
fi
-AC_SUBST([ALBERT_LIBS_$1$2])
+AC_SUBST([ALBERTA_LIBS_$1$2])
dnl
-dnl search for albert.h header
+dnl search for alberta.h header
dnl
AC_CACHE_CHECK(
- [whether albert.h exist and works with DIM=$1 and DIM_OF_WORLD=$2],
- [ac_cv_header_albert$1$2_h],
- [ac_albert_save_CPPFLAGS="$CPPFLAGS"
- unset ac_cv_header_albert_h
- CPPFLAGS="-DDIM=$1 -DDIM_OF_WORLD=$2 -DEL_INDEX=${ELINDEX:-0} -I$ALBERT_INCLUDE_PATH $CPPFLAGS"
- AC_CHECK_HEADERS(albert.h,
- [unset ac_cv_header_albert_h
- ac_cv_header_albert$1$2_h=yes],
- [ac_cv_header_albert$1$2_h=no
- AC_MSG_ERROR([Header file "albert.h" not found])])
- CPPFLAGS="$ac_albert_save_CPPFLAGS"
+ [whether alberta.h exist and works with DIM=$1 and DIM_OF_WORLD=$2],
+ [ac_cv_header_alberta$1$2_h],
+ [ac_alberta_save_CPPFLAGS="$CPPFLAGS"
+ unset ac_cv_header_alberta_h
+ CPPFLAGS="-DDIM=$1 -DDIM_OF_WORLD=$2 -DEL_INDEX=${ELINDEX:-0} -I$ALBERTA_INCLUDE_PATH $CPPFLAGS"
+ AC_CHECK_HEADERS(alberta.h,
+ [unset ac_cv_header_alberta_h
+ ac_cv_header_alberta$1$2_h=yes],
+ [ac_cv_header_alberta$1$2_h=no
+ AC_MSG_ERROR([Header file "alberta.h" not found])])
+ CPPFLAGS="$ac_alberta_save_CPPFLAGS"
])
- if test $ac_cv_header_albert$1$2_h = yes; then
- AC_DEFINE([HAVE_ALBERT$1$2_H], 1,
- [Define if "albert.h" works with DIM=$1 and DIM_OF_WORLD=$2.])
+ if test $ac_cv_header_alberta$1$2_h = yes; then
+ AC_DEFINE([HAVE_ALBERTA$1$2_H], 1,
+ [Define if "alberta.h" works with DIM=$1 and DIM_OF_WORLD=$2.])
fi
])
diff --git a/m4/check-albert-qgl.m4 b/m4/check-albert-qgl.m4
index bca9a1c..922fd5d 100644
--- a/m4/check-albert-qgl.m4
+++ b/m4/check-albert-qgl.m4
@@ -1,17 +1,17 @@
dnl
dnl $1: dim, $2: DOW, $3: optional/required
dnl
-AC_DEFUN([ALBERT_CHECK_QGL],
-[if test "${with_albert_qgl22+set}" = set -a \
- "$with_albert_qgl22" = no; then
+AC_DEFUN([ALBERTA_CHECK_QGL],
+[if test "${with_alberta_qgl22+set}" = set -a \
+ "$with_alberta_qgl22" = no; then
:
else
- ALBERT_CHECK_QT($3)
- ac_albert_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="-DDIM=$1 -DDIM_OF_WORLD=$2 -DEL_INDEX=${EL_INDEX} -I$ALBERT_INCLUDE_PATH $CPPFLAGS"
- ALBERT_CHECK_PACKAGE(albert-qgl$1$2, albert-qgl$1$2, $ALBERT_LIB_PATH,
- $ALBERT_LIBS_$1$2 $Qt_LIB $OpenGL_LIB,
- albert-qgl.h, $ALBERT_INCLUDE_PATH, $3)
- CPPFLAGS="$ac_albert_save_CPPFLAGS"
+ ALBERTA_CHECK_QT($3)
+ ac_alberta_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="-DDIM=$1 -DDIM_OF_WORLD=$2 -DEL_INDEX=${EL_INDEX} -I$ALBERTA_INCLUDE_PATH $CPPFLAGS"
+ ALBERTA_CHECK_PACKAGE(alberta-qgl$1$2, alberta-qgl$1$2, $ALBERTA_LIB_PATH,
+ $ALBERTA_LIBS_$1$2 $Qt_LIB $OpenGL_LIB,
+ alberta-qgl.h, $ALBERTA_INCLUDE_PATH, $3)
+ CPPFLAGS="$ac_alberta_save_CPPFLAGS"
fi
])
\ No newline at end of file
diff --git a/m4/check-package.m4 b/m4/check-package.m4
index 85fa299..449cc55 100644
--- a/m4/check-package.m4
+++ b/m4/check-package.m4
@@ -12,7 +12,7 @@ dnl $5: header name
dnl $6: include path (-I$6)
dnl $7 \in \{optional, required\}, bail out if required, warning otherwise
dnl
-AC_DEFUN([ALBERT_CHECK_PKG_OPT],
+AC_DEFUN([ALBERTA_CHECK_PKG_OPT],
[AC_ARG_WITH($1,
AC_HELP_STRING([--without-$1], [disable use of package $1
(default: autodetect)]),
@@ -28,7 +28,7 @@ AC_HELP_STRING([--without-$1], [disable use of package $1
esac],
[m4_bpatsubst([$1],-,_)_DISABLE=no])
])
-AC_DEFUN([ALBERT_CHECK_PKG_HDR_OPT],
+AC_DEFUN([ALBERTA_CHECK_PKG_HDR_OPT],
[AC_ARG_WITH($1-headers,
AC_HELP_STRING([--with-$1-headers=DIR],
[use $1 include files below directory DIR (default: $2)]),
@@ -42,14 +42,14 @@ AC_HELP_STRING([--with-$1-headers=DIR],
esac],
[m4_bpatsubst([$1],-,_)_INCLUDE_PATH=$DEFAULT_INCDIR])
])
-AC_DEFUN(ALBERT_CHECK_PACKAGE,
+AC_DEFUN(ALBERTA_CHECK_PACKAGE,
[AC_REQUIRE([AC_SET_PREFIX])
#
# foobar
#
-m4_if($7, optional,[ALBERT_CHECK_PKG_OPT([$1])])
+m4_if($7, optional,[ALBERTA_CHECK_PKG_OPT([$1])])
dnl if test "$7" = "optional"; then
-dnl ALBERT_CHECK_PKG_OPT([$1])
+dnl ALBERTA_CHECK_PKG_OPT([$1])
dnl fi
if test "${m4_bpatsubst([$1],-,_)_DISABLE}" = yes; then
@@ -81,7 +81,7 @@ if test -z "$6"; then
else
DEFAULT_INCDIR=$6
fi
-m4_if($5,[],[],[ALBERT_CHECK_PKG_HDR_OPT([$1], [$6])])
+m4_if($5,[],[],[ALBERTA_CHECK_PKG_HDR_OPT([$1], [$6])])
dnl
dnl now check if the library and header files exist
dnl
diff --git a/m4/check-qt.m4 b/m4/check-qt.m4
index 6b50c07..6bfb131 100644
--- a/m4/check-qt.m4
+++ b/m4/check-qt.m4
@@ -2,7 +2,7 @@ dnl
dnl $1 == required: bail out on error
dnl $1 == optional: just issue a warning.
dnl
-AC_DEFUN([ALBERT_CHECK_QT],
+AC_DEFUN([ALBERTA_CHECK_QT],
[AC_ARG_WITH([qtdir],
[ --with-qtdir=QTDIR Attempt to use the QT toolkit located in QTDIR.
Default: ${QTDIR}.],
@@ -24,7 +24,7 @@ esac],
done
])
AC_LANG_PUSH([C++])
-ALBERT_CHECK_PACKAGE(Qt, qt-mt, ${QTDIR}/lib, ${X_LIBS} -lX11,
+ALBERTA_CHECK_PACKAGE(Qt, qt-mt, ${QTDIR}/lib, ${X_LIBS} -lX11,
qgl.h, ${QTDIR}/include, $1)
AC_LANG_POP
dnl
diff --git a/m4/type-sizes.m4 b/m4/type-sizes.m4
index 0a01d82..2c72adc 100644
--- a/m4/type-sizes.m4
+++ b/m4/type-sizes.m4
@@ -1,7 +1,7 @@
dnl
dnl Mmmh. Maybe shouldn't do this
dnl
-AC_DEFUN([ALBERT_TYPE_SIZES],
+AC_DEFUN([ALBERTA_TYPE_SIZES],
[AC_C_BIGENDIAN
AC_C_CONST
AC_C_INLINE
--
GitLab