Integrated t8code as a submodule

Author: Niklas997

Makefile.am

@@ -1,14 +1,15 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I config @CMC_T8_AMFLAGS@
 
 AM_CPPFLAGS = -I@includedir@ @CPPFLAGS@ 
-AM_CXXFLAGS = -std=c++2a -Wall -Wextra
+AM_CXXFLAGS = -std=c++2a 
+#-Wall -Wextra
 AM_LDFLAGS = -L@libdir@ @LDFLAGS@
 AM_FCFLAGS = @FCFLAGS@
 
 CLEANFILES = 
 DISTCLEANFILES = 
 EXTRA_DIST = 
-LDADD = 
+LDADD =
 bin_PROGRAMS =
 nodist_include_HEADERS = 
 include_HEADERS = 
@@ -18,6 +19,9 @@ MODSOURCES =
 check_PROGRAMS = 
 TESTS = 
 
+SUBDIRS = $(subdirs) $(subdirs_extra)
+DIST_SUBDIRS = $(SUBDIRS)
+
 DISTCLEANFILES += src/cmc_ac_config.h 
 
 EXTRA_DIST += bootstrap

bootstrap

@@ -1,5 +1,13 @@
 #! /bin/sh
 
+# Run the t8code bootstrap script if it has been initialized as a submodule
+if test -x "t8code/bootstrap" ; then
+    echo "Running bootstrap in the t8code submodule"
+    (cd t8code && ./bootstrap)
+fi
+
+rm -rf autom4te.cache
+
 LIBTOOLIZE=`which glibtoolize 2>/dev/null`
 if test ! -x "$LIBTOOLIZE" ; then LIBTOOLIZE=`which libtoolize` ; fi
 if test ! -x "$LIBTOOLIZE" ; then echo "bootstrap requires libtoolize" ; exit 1 ; fi

configure.ac

@@ -72,18 +72,6 @@ fi
 AM_CONDITIONAL([WITH_MODDIR], [test "x$withval" != xno])
 CMC_WITH_MODDIR="$withval"
 
-# ==========================================================
-# Check if option with-t8code is given =====================
-AC_ARG_WITH([t8code],
-    [AS_HELP_STRING([--with-t8code], [compile with t8code support])],,
-    [withval=no])
-
-if test "x$withval" != xno ; then
-    AC_DEFINE([WITH_T8CODE], 1, [Define if t8code-linkage is enabled.])
-fi
-AM_CONDITIONAL([WITH_T8CODE], [test "x$withval" != xno])
-CMC_WITH_T8CODE="$withval"
-
 # ==========================================================
 # Check if option with-netcdf is given =====================
 AC_ARG_WITH([netcdf],
@@ -96,6 +84,39 @@ fi
 AM_CONDITIONAL([WITH_NETCDF], [test "x$withval" != xno])
 CMC_WITH_NETCDF="$withval"
 
+# ==========================================================
+# Check if option with-t8code is given =====================
+AC_ARG_WITH([t8code],
+    [AS_HELP_STRING([--with-t8code], [compile with external t8code support])],,
+    [withval=no])
+
+CMC_LIB_ADD_T8_SUBMODULE=
+CMC_T8_CONFIG_AMFLAGS=
+CMC_T8_SC_P4EST_CPP_FLAGS=
+if test "x$withval" != xno ; then
+    AC_DEFINE([WITH_T8CODE], 1, [Define if external t8code-linkage is enabled.])
+else
+    # If the option is not given, we will use t8code as a submodule
+    AX_SUBDIRS_CONFIGURE([t8code],
+        [],[],[[--with-netcdf=no],[--enable-fortran=no],[--with-moddir=no]],[])
+    AC_DEFINE([WITH_T8CODE], 1, [Define if internal t8code-linkage is enabled.])
+
+    CMC_T8_SC_P4EST_CPP_FLAGS+=" -I\$(top_srcdir)/t8code/src -It8code/config -It8code/src"
+    CMC_T8_SC_P4EST_CPP_FLAGS+=" -I\$(top_srcdir)/t8code/sc/src -It8code/sc/config -It8code/sc/src"
+    CMC_T8_SC_P4EST_CPP_FLAGS+=" -I\$(top_srcdir)/t8code/p4est/src -It8code/p4est/config -It8code/p4est/src"
+    CMC_LIB_ADD_T8_SUBMODULE="\$(top_builddir)/t8code/src/libt8.la \$(top_builddir)/t8code/sc/src/libsc.la \$(top_builddir)/t8code/p4est/src/libp4est.la"
+    CMC_T8_CONFIG_AMFLAGS="-I \$(top_srcdir)/t8code/config -I \$(top_srcdir)/t8code/sc/config -I \$(top_srcdir)/t8code/p4est/config"
+fi
+AC_SUBST(CMC_LDADD_T8_SUBMODULE, $CMC_LIB_ADD_T8_SUBMODULE)
+AC_SUBST(CMC_T8_AMFLAGS, $CMC_T8_CONFIG_AMFLAGS)
+AC_SUBST(CMC_T8_CPPFLAGS, $CMC_T8_SC_P4EST_CPP_FLAGS)
+
+# In either case, we will have an available t8code
+AM_CONDITIONAL([WITH_T8CODE], [TRUE])
+
+# We store the value seperately, because in case of an external t8code linkage,
+# its access has to be checked.
+CMC_WITH_T8CODE="$withval"
 
 # ==========================================================
 # Check whether compilers have been set as environment
@@ -326,7 +347,7 @@ if test "x$CMC_WITH_T8CODE" != xno ; then
     AC_LANG_PUSH([C])
     AC_LINK_IFELSE([AC_LANG_PROGRAM(
         [[
-        #include <t8_forest.h>
+        #include <t8_forest/t8_forest.h>
         ]],[[
         t8_forest_t forest;
         ]])],
@@ -362,7 +383,7 @@ AC_DEFINE_UNQUOTED(LIBS,        ["${LIBS}"],        [Libraries])
 AC_PROG_INSTALL
 
 # Initialize automake after all compilers and preprocessors have been found
-AM_INIT_AUTOMAKE([subdir-objects])
+AM_INIT_AUTOMAKE([parallel-tests subdir-objects])
 
 # Initialize Libtool
 LT_INIT

src/Makefile.am

@@ -101,14 +101,16 @@ endif
 
 src_libcmc_la_CPPFLAGS = $(AM_CPPFLAGS)
 src_libcmc_la_LDFLAGS = $(AM_LDFLAGS)
-src_libcmc_la_LIBFLAGS = $(NETCDF_LIBFLAGS) $(T8CODE_LIBFLAGS)
 src_libcmc_la_CXXFLAGS = $(AM_CXXFLAGS)
 src_libcmc_la_CFLAGS = $(CMC_CFLAGS)
 if ENABLE_FORTRAN
 src_libcmc_la_FCFLAGS = $(AM_FCFLAGS)
 src_libcmc_la_FFLAGS = $(CMC_FFLAGS)
 endif
+src_libcmc_la_LIBFLAGS = $(NETCDF_LIBFLAGS) $(T8CODE_LIBFLAGS) @CMC_LDADD_T8_SUBMODULE@
+src_libcmc_la_LIBADD = @CMC_LDADD_T8_SUBMODULE@
+EXTRA_src_libcmc_la_DEPENDENCIES = @CMC_LDADD_T8_SUBMODULE@
 
-LDADD += @top_builddir@/src/libcmc.la $(NETCDF_LIBFLAGS) $(T8CODE_LIBFLAGS)
+LDADD += @top_builddir@/src/libcmc.la @CMC_LDADD_T8_SUBMODULE@
 
-AM_CPPFLAGS += -I@top_srcdir@/src
+AM_CPPFLAGS += -I@top_srcdir@/src @CMC_T8_CPPFLAGS@