[sword-svn] r3425 - trunk

[scribe at crosswire.org]

Author: scribe
Date: 2016-07-03 07:27:56 -0700 (Sun, 03 Jul 2016)
New Revision: 3425

Modified:
   trunk/configure.ac
Log:
added template-depth = 100 to pass newest g++

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2016-06-27 05:19:44 UTC (rev 3424)
+++ trunk/configure.ac	2016-07-03 14:27:56 UTC (rev 3425)
@@ -13,6 +13,9 @@
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 
+# this doesn't work
+#AM_INIT_AUTOMAKE([subdir-objects])
+
 AM_CONFIG_HEADER(include/config.h)
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -115,7 +118,7 @@
 fi
 
 AM_CFLAGS="$AM_CFLAGS -fPIC"
-AM_CXXFLAGS="$AM_CXXFLAGS -fPIC"
+AM_CXXFLAGS="$AM_CXXFLAGS -fPIC -ftemplate-depth=100"
 
 # ---------------------------------------------------------------------
 # Check libraries
@@ -224,9 +227,6 @@
 AM_CFLAGS="$AM_CFLAGS -D_ICUSWORD_"
 fi
 
-
-AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
-
 if test x$enable_warnings = xyes; then
   AM_CFLAGS="$AM_CFLAGS -Werror"
   AM_CXXFLAGS="$AM_CXXFLAGS -Werror -Woverloaded-virtual"
@@ -278,7 +278,7 @@
 fi
 
 if test x$with_cxx11regex = xyes; then
-	AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11 -ftemplate-depth=100"
+	AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11"
 fi
 
 # ---------------------------------------------------------------------