Index: Makefile.in
===================================================================
--- Makefile.in	(revision 12128)
+++ Makefile.in	(working copy)
@@ -1,14 +1,14 @@
 MKOCTFILE ?= mkoctfile
 
-OCTFILES=mshm_refine.oct mshm_dolfin_read.oct mshm_dolfin_write.oct
+OCTFILES = mshm_refine.oct mshm_dolfin_read.oct mshm_dolfin_write.oct
 
-CPPFLAGS += @DEFS@
-LIBS += @LIBS@
+CPPFLAGS += @ac_dolfin_cpp_flags@
+LDFLAGS += @ac_dolfin_ld_flags@
 
 all: $(OCTFILES)
 
 %.oct:  %.cc
-	$(MKOCTFILE) $(CPPFLAGS) $< $(LDFLAGS) $(LIBS)
+	$(MKOCTFILE) $(CPPFLAGS) $< $(LDFLAGS) 
 
 clean:
 	-rm -f *.o core octave-core *.oct *~ *.xml
Index: configure.ac
===================================================================
--- configure.ac	(revision 12128)
+++ configure.ac	(working copy)
@@ -10,8 +10,8 @@
 fi
 
 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_SUBST(ac_dolfin_cpp_flags,-DHAVE_DOLFIN_H) AC_SUBST(ac_dolfin_ld_flags,-ldolfin)],
+  [AC_MSG_WARN([dolfin headers could not be found, som functionalities will be disabled, don't worry your package will still be working, though.])]
 )
 
 AC_CONFIG_FILES([Makefile])