Fix detection of NETGEN libraries in m4 macro (didn't work on Ubuntu 11.10)
This commit is contained in:
parent
3cc645d8a7
commit
6923ab131d
@ -106,8 +106,8 @@ if test "x$NETGEN_HOME" != "x"; then
|
|||||||
|
|
||||||
AC_MSG_CHECKING(for Netgen libraries)
|
AC_MSG_CHECKING(for Netgen libraries)
|
||||||
|
|
||||||
LDFLAGS_old="$LDFLAGS"
|
LIBS_old="$LIBS"
|
||||||
LDFLAGS="-L. -lNETGEN $CAS_LDPATH -lTKernel -lTKMath -lTKG3d -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo $LDFLAGS"
|
LIBS="-L. -lNETGEN $CAS_LDPATH -lTKernel -lTKMath -lTKG3d -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo $LIBS"
|
||||||
|
|
||||||
AC_TRY_COMPILE(#include <iostream>
|
AC_TRY_COMPILE(#include <iostream>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
@ -153,8 +153,8 @@ namespace nglib {
|
|||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
LDFLAGS_old="$LDFLAGS"
|
LIBS_old="$LIBS"
|
||||||
LDFLAGS="-L${NETGEN_LIBS_DIR} -lnglib $CAS_LDPATH -lTKernel -lTKMath -lTKG3d -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo -lTKGeomBase $LDFLAGS"
|
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_MSG_CHECKING(for official Netgen libraries)
|
||||||
AC_CACHE_VAL(salome_cv_netgen_lib,[
|
AC_CACHE_VAL(salome_cv_netgen_lib,[
|
||||||
@ -227,7 +227,7 @@ namespace nglib {
|
|||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LDFLAGS="$LDFLAGS_old"
|
LIBS="$LIBS_old"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CPPFLAGS="$CPPFLAGS_old"
|
CPPFLAGS="$CPPFLAGS_old"
|
||||||
|
Loading…
Reference in New Issue
Block a user