Diff of /src/configure.ac [a28b50] .. [5292e0]  Maximize  Restore

Switch to side-by-side view

--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1,10 +1,12 @@
 AC_PREREQ([2.67])
-AC_INIT([Msh Package], [1.0])
+AC_INIT([Fem-fenics Package], [0.0.1])
 
 AC_USE_SYSTEM_EXTENSIONS
 
 AC_PROG_CXX
 AC_LANG(C++)
+
+PKG_PROG_PKG_CONFIG
 
 # Get Dense include locations
 AC_ARG_WITH([eigen-includedir],
@@ -15,30 +17,46 @@
 AC_SUBST(DENSE_CPPFLAGS)
 echo $DENSE_CPPFLAGS
 
-CPPFLAGS="$DENSE_CPPFLAGS $CPPFLAGS"
+## Check for Eigen
+AC_MSG_CHECKING([for eigen3])
 
-# Check for Dense and dolfin
-have_dense_ok=no
-AC_CHECK_HEADERS([Eigen/Dense],[have_dense_ok=yes;break],[],[])
+EIGEN_CPPFLAGS=
+EIGEN_LDFLAGS=
+EIGEN_LIBS=
 
-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
+PKG_CHECK_EXISTS([eigen3],
+  [EIGEN_CPPFLAGS=`$PKG_CONFIG --cflags-only-I eigen3`
+   EIGEN_LDFLAGS=`$PKG_CONFIG --libs-only-L eigen3`
+   EIGEN_LIBS=`$PKG_CONFIG --libs-only-l eigen3`
+   AC_MSG_RESULT([yes])],
+  [AC_MSG_RESULT([no])
+   AC_MSG_ERROR([eigen3 required to install $PACKAGE_NAME])]
+  )
 
-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_SUBST(EIGEN_CPPFLAGS)
+AC_SUBST(EIGEN_LDFLAGS)
+AC_SUBST(EIGEN_LIBS)
+
+## Check for dolfin
+AC_MSG_CHECKING([for dolfin])
+
+DOLFIN_CPPFLAGS=
+DOLFIN_LDFLAGS=
+DOLFIN_LIBS=
+
+PKG_CHECK_EXISTS([dolfin],
+  [DOLFIN_CPPFLAGS=`$PKG_CONFIG --cflags-only-I dolfin`
+   DOLFIN_LDFLAGS=`$PKG_CONFIG --libs-only-L dolfin`
+   DOLFIN_LIBS=`$PKG_CONFIG --libs-only-l dolfin`
+   AC_MSG_RESULT([yes])],
+  [AC_MSG_RESULT([no])
+   AC_MSG_ERROR([dolfin required to install $PACKAGE_NAME])]
+  )
+
+AC_SUBST(DOLFIN_CPPFLAGS)
+AC_SUBST(DOLFIN_LDFLAGS)
+AC_SUBST(DOLFIN_LIBS)
+
 
 AC_CHECK_PROG([HAVE_FFC], [ffc], [yes], [no])
 if [test $HAVE_FFC = "no"]; then