# HG changeset patch
# User Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
# Date 1393645643 -3600
# Node ID b9999ff4fe5e0f24262dad986f7a51adc7de2310
# Parent  37bcbf7095be0bd8ceb2766ff351d08c9113388b
maint: configure.ac accpets includedir for Dense.

diff -r 37bcbf7095be -r b9999ff4fe5e src/bootstrap
--- a/src/bootstrap	Fri Feb 21 16:41:25 2014 +0000
+++ b/src/bootstrap	Sat Mar 01 04:47:23 2014 +0100
@@ -1,5 +1,7 @@
 #!/bin/bash
 ## Octave-Forge: msh package bootstrap script
+set -e
+autoreconf --verbose --install --force
 
-set -e
-autoconf
+echo "$0: done.  Now you can run './configure'."
+
diff -r 37bcbf7095be -r b9999ff4fe5e src/configure.ac
--- a/src/configure.ac	Fri Feb 21 16:41:25 2014 +0000
+++ b/src/configure.ac	Sat Mar 01 04:47:23 2014 +0100
@@ -1,22 +1,54 @@
 AC_PREREQ([2.67])
 AC_INIT([Msh Package], [1.0])
 
+AC_USE_SYSTEM_EXTENSIONS
+
 AC_PROG_CXX
 AC_LANG(C++)
 
+# Get Dense include locations
+AC_ARG_WITH([dense-includedir],
+  [AS_HELP_STRING([--with-dense-includedir=DIR],
+    [location of the Eigen/Dense headers, defaults to /usr/include/])],
+  [DENSE_CPPFLAGS="-I$withval"],
+  [DENSE_CPPFLAGS='-I/usr/include/'])
+AC_SUBST(DENSE_CPPFLAGS)
+echo $DENSE_CPPFLAGS
+
+CPPFLAGS="$DENSE_CPPFLAGS $CPPFLAGS"
+
+# Check for Dense and dolfin
+have_dense_ok=no
+AC_CHECK_HEADERS([Eigen/Dense],[have_dense_ok=yes;break],[],[])
+
+if test $have_dense_ok = no; then
+  AC_MSG_WARN([Dense headers could not be found,
+                some functionalities will be disabled,
+                don't worry your package will still be
+                working, though.])
+fi
+
+have_dolfin_ok=no
+AC_CHECK_HEADERS([dolfin.h], [have_dolfin_ok=yes; break], [],
+  [#ifdef HAVE_DOLFIN_H
+   #include<dolfin.h>
+   #endif])
+if test $have_dolfin_ok = no; then
+  AC_MSG_WARN([dolfin headers could not be found,
+                some functionalities will be disabled,
+                don't worry your package will still be
+                working, though.])
+fi
+
+AC_CHECK_PROG([HAVE_FFC], [ffc], [yes], [no])
+if [test $HAVE_FFC = "no"]; then
+  AC_MSG_ERROR([ffc required to install $PACKAGE_NAME])
+fi
+
 AC_CHECK_PROG([HAVE_MKOCTFILE], [mkoctfile], [yes], [no])
 if [test $HAVE_MKOCTFILE = "no"]; then
   AC_MSG_ERROR([mkoctfile required to install $PACKAGE_NAME])
 fi
 
-AC_CHECK_HEADERS([dolfin.h], [ ],
-  [AC_MSG_ERROR([dolfin required to install $PACKAGE_NAME])]
-)
-
-AC_CHECK_PROG([HAVE_FFC], [ffc], [yes], [no])
-if [test $HAVE_FFC = "no"]; then
-  AC_MSG_ERROR([ffc required to install $PACKAGE_NAME])
-fi
-
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT