Skip to content
Snippets Groups Projects
Commit 4cb490c8 authored by Daniel Koester's avatar Daniel Koester
Browse files

*** TRANSITION TO SVN ***

Checked in new versions for the m4 files.
parent a1d57087
No related branches found
No related tags found
No related merge requests found
dnl
dnl Check for ALBERTA libraries at given dimensions, taking EL_INDEX and DEBUG
dnl into account. $1 is dimension, $2 is DIM_OF_WORLD.
dnl Check for ALBERTA libraries at given dimension, taking DEBUG
dnl into account. $1 is DIM_OF_WORLD.
dnl
dnl old style (ALBERTA-1.2)
dnl Current style (ALBERTA-2.0): library name is
dnl
dnl ALBERTA_CHECK(DIM, DIM_OF_WORLD)
dnl
dnl New style: library name is
dnl
dnl libALBERTA<DIM><DOW>_<DEBUG>[EL_INDEX]
dnl
dnl EL_INDEX is present ONLY if it is non-zero
dnl
dnl
dnl
dnl new style (DIM is variable)
dnl
dnl ALBERTA_CHECK(DIM_OF_WORLD)
dnl
dnl New style: library name is
dnl
dnl libALBERTA<DOW>_<DEBUG><EL_INDEX>
dnl libalberta<DOW>[_DEBUG]
dnl
dnl
dnl Check for ALBERTA libraries at given dimensions, taking EL_INDEX and DEBUG
dnl into account. $1 is dimension, $2 is DIM_OF_WORLD.
dnl
AC_DEFUN([ALBERTA_CHECK],
[AC_REQUIRE([ALBERTA_TYPE_SIZES])
AC_REQUIRE([ALBERTA_OPTIONS])
AC_REQUIRE([AC_SET_PREFIX])
AC_REQUIRE([ALBERTA_SET_PREFIX])
AC_REQUIRE([ALBERTA_AUX_CHECK])
#
# Now check for libALBERTA_XXX itself
#
# BIG FAT NOTE:
#
m4_if($#,1,[ALBERTA_CHECK_NEWLIBS($1)],[ALBERTA_CHECK_OLDLIBS($1,$2)])
ALBERTA_CHECK_NEWLIBS($1)
])
dnl
......@@ -47,29 +22,32 @@ dnl DIM_OF_WORLD is passed in $1
dnl
AC_DEFUN([ALBERTA_CHECK_NEWLIBS],
[
ALBERTA_LIB_$1=ALBERTA$1_${ALBERTA_DEBUG}${EL_INDEX}
ALBERTA_LIB_$1_C=ac_cv_lib_ALBERTA$1_${ALBERTA_DEBUG}${EL_INDEX}
if test "${DEBUG}" = "1"; then
ALBERTA_LIB_$1=alberta$1_debug
ALBERTA_LIB_$1_C=ac_cv_lib_ALBERTA$1_DEBUG
else
ALBERTA_LIB_$1=alberta$1
ALBERTA_LIB_$1_C=ac_cv_lib_ALBERTA$1
fi
#
AC_CACHE_CHECK([for additional libraries needed to link],
[ac_cv_libalberta$1_gfxlibs],
[ac_cv_libalberta$1_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"
"$GLTOOLS_LIB $OPENGL_LIB ${X_LIBS} -lX11"
do
eval "unset ${ALBERTA_LIB_$1_C}___main"
AC_CHECK_LIB($ALBERTA_LIB_$1, main,
[ac_cv_libalberta$1_gfxlibs="$GFX_LIBS"
break],,
[$CSOLVER_ALL_LIB $GFX_LIBS])
[$GFX_LIBS])
done])
if test "$ac_cv_libalberta$1_gfxlibs" = unset; then
AC_MSG_ERROR([Unable to link a program with lib$ALBERTA_LIB_$1!])
else
ALBERTA_LIBS_$1="-L$ALBERTA_LIB_PATH -l$ALBERTA_LIB_$1 $CSOLVER_ALL_LIB $ac_cv_libalberta$1_gfxlibs"
ALBERTA_LIBS_$1="-L$ALBERTA_LIB_PATH -l$ALBERTA_LIB_$1 $ac_cv_libalberta$1_gfxlibs"
fi
AC_SUBST([ALBERTA_LIBS_$1])
dnl
......@@ -80,7 +58,7 @@ AC_CACHE_CHECK(
[ac_cv_header_alberta$1_h],
[ac_alberta_save_CPPFLAGS="$CPPFLAGS"
unset ac_cv_header_alberta_h
CPPFLAGS="-DDIM_OF_WORLD=$1 -DEL_INDEX=${EL_INDEX} -I$ALBERTA_INCLUDE_PATH $CPPFLAGS"
CPPFLAGS="-DDIM_OF_WORLD=$1 -I$ALBERTA_INCLUDE_PATH $CPPFLAGS"
AC_CHECK_HEADERS(alberta.h,
[unset ac_cv_header_alberta_h
ac_cv_header_alberta$1_h=yes],
......@@ -94,78 +72,12 @@ AC_CACHE_CHECK(
fi
])
dnl
dnl Old-style, DIM _and_ DIM_OF_WORLD is fixed.
dnl
dnl DIM is passed in $1
dnl DIM_OF_WORLD is passed in $2
dnl
AC_DEFUN([ALBERTA_CHECK_OLDLIBS],
[
if test "${EL_INDEX}" = "0"; then
ALBERTA_LIB_$1$2=ALBERTA$1$2_${ALBERTA_DEBUG}
ALBERTA_LIB_$1$2_C=ac_cv_lib_ALBERTA$1$2_${ALBERTA_DEBUG}
else
ALBERTA_LIB_$1$2=ALBERTA$1$2_${ALBERTA_DEBUG}${EL_INDEX}
ALBERTA_LIB_$1$2_C=ac_cv_lib_ALBERTA$1$2_${ALBERTA_DEBUG}${EL_INDEX}
fi
#
AC_CACHE_CHECK([for additional libraries needed to link],
[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 ${ALBERTA_LIB_$1$2_C}___main"
AC_CHECK_LIB($ALBERTA_LIB_$1$2, main,
[ac_cv_libalberta$1$2_gfxlibs="$GFX_LIBS"
break],,
[$CSOLVER_ALL_LIB $GFX_LIBS])
done])
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
ALBERTA_LIBS_$1$2="-L$ALBERTA_LIB_PATH -l$ALBERTA_LIB_$1$2 $CSOLVER_ALL_LIB $ac_cv_libalberta$1$2_gfxlibs"
fi
AC_SUBST([ALBERTA_LIBS_$1$2])
dnl
dnl search for alberta.h header
dnl
AC_CACHE_CHECK(
[whether alberta.h exist and works with DIM=$1, 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=${EL_INDEX} -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_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
])
dnl
dnl Define this outside ALBERTA_CHECK() so that it can be AC_REQUIRE'd
dnl
AC_DEFUN([ALBERTA_OPTIONS],
[
AC_ARG_ENABLE(el_index,
[ --enable-el_index use an EL_INDEX enabled version of the ALBERTA
libraries (default is off)],
[EL_INDEX=1],
[EL_INDEX=0])
AC_SUBST([EL_INDEX])
dnl
AC_ARG_ENABLE(debug,
[ --enable-debug use debug-enabled ALBERTA libraries (default: off)],
[ALBERTA_DEBUG=1],
......@@ -217,12 +129,10 @@ fi])
AC_SUBST(ALBERTA_INCLUDE_PATH)
dnl
dnl Now check for the libraries ALBERTA might depend on. Take into
dnl account that we might need gltools and PLOTansi and OpenGL
dnl account that we might need gltools and OpenGL
dnl
ALBERTA_CHECK_PACKAGE(OpenGL, GL, ${x_libraries}, ${X_LIBS} -lX11,
gl.h, ${x_includes}/GL ,, optional)
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)
......@@ -233,10 +143,7 @@ AC_CHECK_LIB(blas, dnrm2,
AC_LANG_POP(Fortran 77)
# Cache check-point
AC_CACHE_SAVE
ALBERTA_CHECK_PACKAGE(alberta_util, alberta_util, $ALBERTA_LIB_PATH, -lm,
ALBERTA_CHECK_PACKAGE(alberta_util, alberta_util, $ALBERTA_LIB_PATH,
-lm ${FLIBS},
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)
])
])
\ No newline at end of file
......@@ -6,18 +6,12 @@
# config-files, it breaks "make distclean"
#
AC_DEFUN([ALBERTA_DIMENSION_DISABLE],
[SIMPLE_ENABLE_FLAG([alberta-$1],
[ALBERTA_ENABLE_FLAG([alberta-$1],
[disable building of an ALBERTA library for Finite Elements of dimension $1.], 1)
dnl if test "$ALBERTA_$1$1" -eq 1; then
AC_CONFIG_FILES([ALBERTA/src/ALBERTA$1_00/Makefile])
AC_CONFIG_FILES([alberta/src/alberta$1/Makefile])
dnl if test "$DEBUG" -eq 1; then
AC_CONFIG_FILES([ALBERTA/src/ALBERTA$1_10/Makefile])
dnl fi
dnl if test "$EL_INDEX" -eq 1; then
AC_CONFIG_FILES([ALBERTA/src/ALBERTA$1_01/Makefile])
dnl fi
dnl if test "$DEBUG" -eq 1 -a "$EL_INDEX" -eq 1; then
AC_CONFIG_FILES([ALBERTA/src/ALBERTA$1_11/Makefile])
AC_CONFIG_FILES([alberta/src/alberta$1_debug/Makefile])
dnl fi
dnl fi
])
......@@ -8,10 +8,10 @@ AC_DEFUN([ALBERTA_CHECK_QGL],
else
ALBERTA_CHECK_QT($3)
ac_alberta_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-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 $Qt_LIB $OpenGL_LIB,
alberta-qgl.h, $ALBERTA_INCLUDE_PATH, $3)
CPPFLAGS="-DDIM_OF_WORLD=$2 -I$ALBERTA_INCLUDE_PATH $CPPFLAGS"
ALBERTA_CHECK_PACKAGE(alberta-qgl$1$2, alberta-qgl$1$2,
$ALBERTA_LIB_PATH, $ALBERTA_LIBS_$1 $Qt_LIB $OpenGL_LIB,
alberta-qgl.h, $ALBERTA_INCLUDE_PATH, $3)
CPPFLAGS="$ac_alberta_save_CPPFLAGS"
fi
])
\ No newline at end of file
......@@ -20,7 +20,7 @@ dnl $5 may be empty (e.g. to check for a Fortran library). In this case
dnl $6 is ignored
dnl
dnl $7 may be empty, actually the idea to install libraries and
dnl headers in the same diretory is a little bit awkward.
dnl headers in the same directory is a little bit awkward.
dnl
dnl This Macro defines the following variables:
dnl
......@@ -105,8 +105,8 @@ esac])
dnl
dnl the macro itself
dnl
AC_DEFUN(ALBERTA_CHECK_PACKAGE,
[AC_REQUIRE([AC_SET_PREFIX])
AC_DEFUN([ALBERTA_CHECK_PACKAGE],
[AC_REQUIRE([ALBERTA_SET_PREFIX])
m4_if($#,
8,,[
errprint([$0] needs EXACTLY eight (8) arguments, but got $#
......
......@@ -7,13 +7,13 @@ dnl
ALBERTA_CHECK_PACKAGE(grape, gr, , ${OPENGL_LIB} ${X_ALL_LIBS}, grape.h,,, optional)
AM_CONDITIONAL(GRAPE, test -n "${GRAPE_LIB}")
ALBERTA_LIB_PATH=$prefix/lib
ALBERTA_INCLUDE_PATH='$(top_srcdir)/ALBERTA/src/Common/ -I$(top_srcdir)/ALBERTA_UTIL'
ALBERTA_INCLUDE_PATH='$(top_srcdir)/alberta/src/Common/ -I$(top_srcdir)/alberta_util/src/ -I$(top_builddir)/alberta_util/src/'
ALBERTA_LIBS_1='$(top_builddir)/ALBERTA/src/ALBERTA1_00/libALBERTA1_00.la $(top_builddir)/SOLVER/src/libcsolver.la $(top_builddir)/ALBERTA_UTIL/libalberta_util.la $(top_builddir)/PLOT_ANSI/src/libPLOTansi.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
ALBERTA_LIBS_1='$(top_builddir)/alberta/src/alberta1/libalberta1.la $(top_builddir)/alberta_util/src/libalberta_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
ALBERTA_LIBS_2='$(top_builddir)/ALBERTA/src/ALBERTA2_00/libALBERTA2_00.la $(top_builddir)/SOLVER/src/libcsolver.la $(top_builddir)/ALBERTA_UTIL/libalberta_util.la $(top_builddir)/PLOT_ANSI/src/libPLOTansi.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
ALBERTA_LIBS_2='$(top_builddir)/alberta/src/alberta2/libalberta2.la $(top_builddir)/alberta_util/src/libalberta_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
ALBERTA_LIBS_3='$(top_builddir)/ALBERTA/src/ALBERTA3_00/libALBERTA3_00.la $(top_builddir)/SOLVER/src/libcsolver.la $(top_builddir)/ALBERTA_UTIL/libalberta_util.la $(top_builddir)/PLOT_ANSI/src/libPLOTansi.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
ALBERTA_LIBS_3='$(top_builddir)/alberta/src/alberta3/libalberta3.la $(top_builddir)/alberta_util/src/libalberta_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
ALBERTA_DEBUG=
AC_SUBST(ALBERTA_DEBUG)
AC_SUBST(ALBERTA_LIB_PATH)
......
dnl set prefix to its proper value, so that one can define substitutions
dnl depending on the value of prefix
AC_DEFUN(AC_SET_PREFIX,
AC_DEFUN([ALBERTA_SET_PREFIX],
[test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
......
......@@ -7,7 +7,7 @@
# subsitution (e.g. EL_INDEX), define automake conditional
# (e.g. EL_INDEX).
#
AC_DEFUN([SIMPLE_ENABLE_FLAG],
AC_DEFUN([ALBERTA_ENABLE_FLAG],
[m4_define([FLAGNAME], [m4_bpatsubst(m4_toupper([$1]),-,_)])
m4_if([$3],[1],
[m4_define([NEGDEFAULT],[disable])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment