From 6923ab131d36015627535dafba46d058ca996eea Mon Sep 17 00:00:00 2001 From: gdd Date: Wed, 26 Oct 2011 15:57:20 +0000 Subject: [PATCH] Fix detection of NETGEN libraries in m4 macro (didn't work on Ubuntu 11.10) --- adm_local/unix/config_files/check_NETGEN.m4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/adm_local/unix/config_files/check_NETGEN.m4 b/adm_local/unix/config_files/check_NETGEN.m4 index 8128e31..0e032cf 100644 --- a/adm_local/unix/config_files/check_NETGEN.m4 +++ b/adm_local/unix/config_files/check_NETGEN.m4 @@ -106,8 +106,8 @@ if test "x$NETGEN_HOME" != "x"; then AC_MSG_CHECKING(for Netgen libraries) - LDFLAGS_old="$LDFLAGS" - LDFLAGS="-L. -lNETGEN $CAS_LDPATH -lTKernel -lTKMath -lTKG3d -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo $LDFLAGS" + LIBS_old="$LIBS" + LIBS="-L. -lNETGEN $CAS_LDPATH -lTKernel -lTKMath -lTKG3d -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo $LIBS" AC_TRY_COMPILE(#include #include @@ -153,8 +153,8 @@ namespace nglib { else - LDFLAGS_old="$LDFLAGS" - LDFLAGS="-L${NETGEN_LIBS_DIR} -lnglib $CAS_LDPATH -lTKernel -lTKMath -lTKG3d -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo -lTKGeomBase $LDFLAGS" + LIBS_old="$LIBS" + LIBS="-L${NETGEN_LIBS_DIR} -lnglib $CAS_LDPATH -lTKernel -lTKMath -lTKG3d -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo -lTKGeomBase $LIBS" AC_MSG_CHECKING(for official Netgen libraries) AC_CACHE_VAL(salome_cv_netgen_lib,[ @@ -227,7 +227,7 @@ namespace nglib { fi - LDFLAGS="$LDFLAGS_old" + LIBS="$LIBS_old" fi CPPFLAGS="$CPPFLAGS_old"