disable long debug output and implement --enable-ASN_DEBUG to restore old behavior

4 files changed, 23 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index bfc072d1..ed228573 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 
 0.9.??:
     * Build structure fixes for portability.
+    * Disable long debug of ASN.1 operations during `make check` stage.
+    * Introduce --enable-ASN_DEBUG configure flag to emit long debug output.
 
 0.9.26: 2014-Sep-11
 	* Updated asn1c-usage.pdf.
diff --git a/asn1c/tests/check-assembly.sh b/asn1c/tests/check-assembly.sh
index 82245f0c..4d6e3000 100755
--- a/asn1c/tests/check-assembly.sh
+++ b/asn1c/tests/check-assembly.sh
@@ -41,7 +41,7 @@ asn_module=`echo ../${top_srcdir}/tests/${testno}-*.asn1`
 cat > Makefile <<EOM
 # This file is autogenerated by ../$0
 
-COMMON_FLAGS= -I. -DEMIT_ASN_DEBUG
+COMMON_FLAGS= -I.
 CFLAGS = \${COMMON_FLAGS} ${CFLAGS} -g -O0
 CPPFLAGS = -DSRCDIR=../${srcdir}
 CXXFLAGS = \${COMMON_FLAGS} ${CXXFLAGS}
diff --git a/configure b/configure
index 638eb19f..83cc4e49 100755
--- a/configure
+++ b/configure
@@ -767,6 +767,7 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 enable_Werror
+enable_ASN_DEBUG
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1407,6 +1408,7 @@ Optional Features:
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-Werror         abort compilation after any C compiler warning
+  --enable-ASN_DEBUG      produce debug log during `make check` testing
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -12426,6 +12428,17 @@ if test x$enable_werror = xyes; then
   ADD_CFLAGS="-Werror -W -Wpointer-arith"
 fi
 
+# Check whether --enable-ASN_DEBUG was given.
+if test "${enable_ASN_DEBUG+set}" = set; then :
+  enableval=$enable_ASN_DEBUG; enable_asn_debug=$enableval
+else
+  enable_asn_debug=no
+fi
+
+if test x$enable_asn_debug = xyes; then
+  TESTSUITE_CFLAGS="-DEMIT_ASN_DEBUG"
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wall" >&5
 $as_echo_n "checking whether C compiler accepts -Wall... " >&6; }
 if ${ax_cv_check_cflags___Wall+:} false; then :
diff --git a/configure.ac b/configure.ac
index f0031d8e..3d242c8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,13 @@ if test x$enable_werror = xyes; then
   ADD_CFLAGS="-Werror -W -Wpointer-arith"
 fi
 
+AC_ARG_ENABLE([ASN_DEBUG],
+  [  --enable-ASN_DEBUG      produce debug log during `make check` testing],
+	enable_asn_debug=$enableval, enable_asn_debug=no)
+if test x$enable_asn_debug = xyes; then
+  TESTSUITE_CFLAGS="-DEMIT_ASN_DEBUG"
+fi
+
 AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
 AX_CHECK_COMPILE_FLAG([-Wcast-qual], [CFLAGS="$CFLAGS -Wcast-qual"])
 AX_CHECK_COMPILE_FLAG([-Wchar-subscripts],