diff --git a/m4/albert-check.m4 b/m4/albert-check.m4 index 999516864895f3736ce3e52336f123fda13e76f0..b5b9c9694b9888883db02e2543b614a39574def6 100644 --- a/m4/albert-check.m4 +++ b/m4/albert-check.m4 @@ -5,12 +5,15 @@ AC_ARG_ENABLE(el_index, libraries (default is off)], [ELINDEX=1], ELINDEX=) +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]) dnl dnl Check for ALBERT libraries at given dimensions, taking ELINDEX and DEBUG dnl into account. $1 is DIM, $2 ist DIM_OF_WORLD @@ -85,7 +88,7 @@ ALBERT_LIB_$1$2=ALBERT$1$2_${ALBERT_DEBUG}${ELINDEX} ALBERT_LIB_$1$2_C=ac_cv_lib_ALBERT$1$2_${ALBERT_DEBUG}${ELINDEX} ALBERT_GFX_LIBS_$1$2="" AC_CHECK_LIB($ALBERT_LIB_$1$2, main, - [ALBERT_LIBS_$1$2="-L$ALBERT_LIB_PATH -l$ALBERT_LIB_$2$2 $csolver_LIB"],, + [ALBERT_LIBS_$1$2="-L$ALBERT_LIB_PATH -l$ALBERT_LIB_$1$2 $csolver_LIB"],, $csolver_LIB) if test "x$ALBERT_LIBS_$1$2" = "x" ; then if test "x$OpenGL_LIB" = "x" ; then :; else @@ -101,7 +104,7 @@ if test "x$ALBERT_LIBS_$1$2" = "x" ; then eval "unset ${ALBERT_LIB_$1$2_C}___main" ALBERT_GFX_LIBS_$1$2="$gltools_LIB $OpenGL_LIB ${X_LIB} -lX11" AC_CHECK_LIB($ALBERT_LIB_$1$2, main, - [ALBERT_LIBS_$1$2="-L$ALBERT_LIB_PATH -l$ALBERT_LIB_$1 $csolver_LIB"],, + [ALBERT_LIBS_$1$2="-L$ALBERT_LIB_PATH -l$ALBERT_LIB_$1$2 $csolver_LIB"],, $csolver_LIB $ALBERT_GFX_LIBS_$1$2) fi if test "x$ALBERT_LIBS_$1$2" = "x" && \ @@ -110,7 +113,7 @@ if test "x$ALBERT_LIBS_$1$2" = "x" ; then eval "unset ${ALBERT_LIB_$1$2_C}___main" ALBERT_GFX_LIBS_$1$2="$PLOT_LIB $OpenGL_LIB ${X_LIB} -lX11" AC_CHECK_LIB($ALBERT_LIB_$1$2, main, - [ALBERT_LIBS_$1$2="-L$ALBERT_LIB_PATH -l$ALBERT_LIB_$1 $csolver_LIB"],, + [ALBERT_LIBS_$1$2="-L$ALBERT_LIB_PATH -l$ALBERT_LIB_$1$2 $csolver_LIB"],, $csolver_LIB $ALBERT_GFX_LIBS_$1$2) fi if test "x$ALBERT_LIBS_$1$2" = "x" && \ @@ -120,11 +123,12 @@ if test "x$ALBERT_LIBS_$1$2" = "x" ; then eval "unset ${ALBERT_LIB_$1$2_C}___main" ALBERT_GFX_LIBS_$1$2="$gltools_LIB $PLOT_LIB $OpenGL_LIB ${X_LIB} -lX11" AC_CHECK_LIB($ALBERT_LIB_$1$2, main, - [ALBERT_LIBS_$1$2="-L$ALBERT_LIB_PATH -l$ALBERT_LIB_$1 $csolver_LIB"],, + [ALBERT_LIBS_$1$2="-L$ALBERT_LIB_PATH -l$ALBERT_LIB_$1$2 $csolver_LIB"],, $csolver_LIB $ALBERT_GFX_LIBS_$1$2) fi fi fi +AC_SUBST([ALBERT_LIBS_$1$2]) dnl dnl search for albert.h header dnl