Commit bbe66e1a authored by Iulian Grindeanu's avatar Iulian Grindeanu
Browse files

fbigeom exposure to the world

fbigeom needs to be exposed better for mesquite.
Basically, before this, iRel-Def.inc, did not have a proper reference to FBiGeom.
introduce an extra variable, that will be substituted properly.
I called it FBIGEOM_EXTRA_LIB, but maybe there is a better way.
With this fix, mesquite can be configured even if lasso was configured 
with fbigeom. 
So no need anymore to do the following build trick, to make mesquite happy:

This is what I had to do before:
1) configure lasso without fbigeom
2) build, install lasso 
3) configure mesquite with imesh, igeom, irel; build, install
4) go back to lasso, configure with fbigeom, install
5) go back to mesquite, DO NOT reconfigure, but build with the new lasso.
make, install, and everybody was happy

Now, you just do the normal thing: 
1) build lasso with fbigeom, install
2) configure mesquite and be happy

parent 6815f632
......@@ -82,6 +82,7 @@ AM_CONDITIONAL([ENABLE_IGEOM], [test x$IGEOM_MISSING = xno])
################################################################################
# FBiGeom
################################################################################
FBIGEOM_EXTRA_LIB=
AC_ARG_WITH(fbigeom,
[AC_HELP_STRING([--with-fbigeom=DIR], [Specify directory containing FBiGeom libs/includes or dirs under which lib/ and include/ are located])],
[FBIGEOM_DIR=$withval
......@@ -101,7 +102,7 @@ case "x$FBIGEOM_DIR" in
FBIGEOM_MISSING=no
AC_CHECK_FILE([${FBIGEOM_DIR}/lib/FBiGeom-Defs.inc],
[FBIGEOM_CONFIG_OPTIONS="include ${FBIGEOM_DIR}/lib/FBiGeom-Defs.inc";
DEFINES="$DEFINES -DFBIGEOM"],
DEFINES="$DEFINES -DFBIGEOM"; FBIGEOM_EXTRA_LIB="$FBIGEOM_EXTRA_LIB -lFBiGeomMOAB"],
[AC_CHECK_FILE([${FBIGEOM_DIR}/FBiGeom-Defs.inc],
[FBIGEOM_CONFIG_OPTIONS="include ${FBIGEOM_DIR}/FBiGeom-Defs.inc";
DEFINES="$DEFINES -DFBIGEOM"],
......@@ -112,6 +113,7 @@ case "x$FBIGEOM_DIR" in
esac
AC_SUBST(FBIGEOM_DIR)
AC_SUBST(FBIGEOM_CONFIG_OPTIONS)
AC_SUBST(FBIGEOM_EXTRA_LIB)
AM_CONDITIONAL([ENABLE_FBIGEOM], [test x$FBIGEOM_MISSING = xno])
################################################################################
......
......@@ -12,7 +12,7 @@ IREL_CPPFLAGS = -I$(IREL_INCLUDEDIR)
# This definition is deprecated; use IREL_CPPFLAGS instead
IREL_INCLUDES = $(IREL_CPPFLAGS)
IREL_LIBS = $(IREL_LDFLAGS) -L${IREL_LIBDIR} -liRel @LIBS@
IREL_LIBS = $(IREL_LDFLAGS) -L${IREL_LIBDIR} -liRel @LIBS@ @FBIGEOM_EXTRA_LIB@
IREL_INCLUDEDIR = @abs_srcdir@
IREL_LIBDIR = @abs_builddir@/.libs
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment