Skip to content
Snippets Groups Projects
Commit 7b62dad3 authored by Robert Klöfkorn's avatar Robert Klöfkorn
Browse files

removed quickfix. Instead only link static libraries.

[[Imported from SVN: r1380]]
parent b1121beb
No related branches found
No related tags found
No related merge requests found
......@@ -63,9 +63,11 @@ AC_CHECK_HEADER([alberta.h],
CPPFLAGS="$REM_CPPFLAGS $ALBERTADEF -I$ALBERTA_INCLUDE_PATH"
REM_CPPFLAGS=
# !!! quickfix
ALBERTA_EXTRA="-lPLOTansi $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS $GL_LDFLAGS $GL_LIBS -lXext -lcsolver -lblas -ldl"
LIBS="$ALBERTA_EXTRA"
REM_LDFLAGS=$LDFLAGS
# TODO: check if static flag exists
# link_static_flag defines the flag for the linker to link only static
LDFLAGS="$LDFLAGS $link_static_flag"
# if header is found...
if test x$HAVE_ALBERTA = x1 ; then
......@@ -74,7 +76,7 @@ if test x$HAVE_ALBERTA = x1 ; then
ALBERTA_LDFLAGS="-L$ALBERTA_LIB_PATH"
LIBS="$LIBS $ALBERTA_LIBS"],
[HAVE_ALBERTA="0"
AC_MSG_WARN(libalberta_util not found!)])
AC_MSG_WARN(libalberta_util not.a found!)])
fi
# still everything found?
......@@ -85,9 +87,11 @@ if test x$HAVE_ALBERTA = x1 ; then
AC_CHECK_LIB($albertalibname,[mesh_traverse],
[ALBERTA_LIBS="-l$albertalibname $ALBERTA_LIBS $ALBERTA_EXTRA"],
[HAVE_ALBERTA="0"
AC_MSG_WARN(lib$albertalibname not found!)])
AC_MSG_WARN(lib$albertalibname.a not found!)])
fi
LDFLAGS=$REM_LDFLAGS
## end of alberta check (--without wasn't set)
fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment