Mercurial > forge

changeset 11942:2f60a04cb36f octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug: avoid functions to be compiled if dolfin is not available
author gedeone-octave
date Sat, 13 Jul 2013 22:58:21 +0000
parents fd8b77402517
children bdeab2746dd7
files extra/msh/src/Makefile.in extra/msh/src/configure.ac
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/extra/msh/src/Makefile.in	Fri Jul 12 07:32:20 2013 +0000
+++ b/extra/msh/src/Makefile.in	Sat Jul 13 22:58:21 2013 +0000
@@ -2,15 +2,13 @@
 
 OCTFILES=mshm_refine.oct mshm_dolfin_read.oct mshm_dolfin_write.oct
 
-HAVE_DOLFIN_H = @HAVE_DOLFIN_H@
-ifdef HAVE_DOLFIN_H
-  CPPFLAGS += -DHAVE_DOLFIN_H
-endif
+CPPFLAGS += @DEFS@
+LIBS += @LIBS@
 
 all: $(OCTFILES)
 
 %.oct:  %.cc
-	$(MKOCTFILE) $(CPPFLAGS) $< $(LDFLAGS) -ldolfin
+	$(MKOCTFILE) $(CPPFLAGS) $< $(LDFLAGS) $(LIBS)
 
 clean:
 	-rm -f *.o core octave-core *.oct *~ *.xml
--- a/extra/msh/src/configure.ac	Fri Jul 12 07:32:20 2013 +0000
+++ b/extra/msh/src/configure.ac	Sat Jul 13 22:58:21 2013 +0000
@@ -9,8 +9,10 @@
   AC_MSG_ERROR([mkoctfile required to install $PACKAGE_NAME])
 fi
 
-AC_CHECK_HEADERS([dolfin.h], [ ],
-  [AC_MSG_WARN([dolfin required to install $PACKAGE_NAME])]
+AC_CHECK_HEADER([dolfin.h], 
+  [AC_DEFINE([HAVE_DOLFIN_H], [1], [ ]) LIBS="-ldolfin $LIBS"],
+  [AC_MSG_WARN([dolfin required to install all the functionalities of $PACKAGE_NAME])]
 )
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT