From 65907f075019bc6766b8e8d07cab2dde3380ace8 Mon Sep 17 00:00:00 2001
From: Lev Walkin <vlm@lionet.info>
Date: Sun, 14 Sep 2014 17:19:21 -0700
Subject: portability fixes

---
 ChangeLog               |  3 +++
 asn1c/tests/Makefile.am |  2 +-
 asn1c/tests/Makefile.in |  2 +-
 configure               | 40 ++++++++++++++++++++++++++++++++++++++--
 configure.ac            | 21 ++++++++++++---------
 5 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 70a6e7ca..bfc072d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 
+0.9.??:
+    * Build structure fixes for portability.
+
 0.9.26: 2014-Sep-11
 	* Updated asn1c-usage.pdf.
 	* Made -fskeletons-copy a default option; removed cmdline option.
diff --git a/asn1c/tests/Makefile.am b/asn1c/tests/Makefile.am
index f780a4a9..b4069e5a 100644
--- a/asn1c/tests/Makefile.am
+++ b/asn1c/tests/Makefile.am
@@ -1,7 +1,7 @@
 
 dist_check_SCRIPTS = check-assembly.sh
 
-TESTS_ENVIRONMENT= CC="${CC}" CFLAGS="${TESTSUITE_CFLAGS} ${CFLAGS} -Wno-error=unused-variable" CXXFLAGS="${CXXFLAGS}" srcdir=${srcdir} top_srcdir=${top_srcdir} top_builddir=${top_builddir} ${srcdir}/check-assembly.sh
+TESTS_ENVIRONMENT= CC="${CC}" CFLAGS="${TESTSUITE_CFLAGS} ${CFLAGS}" CXXFLAGS="${CXXFLAGS}" srcdir=${srcdir} top_srcdir=${top_srcdir} top_builddir=${top_builddir} ${srcdir}/check-assembly.sh
 
 TESTS = ${srcdir}/check-src/check-*.c
 if TEST_64BIT
diff --git a/asn1c/tests/Makefile.in b/asn1c/tests/Makefile.in
index a191aa88..f227173b 100644
--- a/asn1c/tests/Makefile.in
+++ b/asn1c/tests/Makefile.in
@@ -175,7 +175,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 dist_check_SCRIPTS = check-assembly.sh
-TESTS_ENVIRONMENT = CC="${CC}" CFLAGS="${TESTSUITE_CFLAGS} ${CFLAGS} -Wno-error=unused-variable" CXXFLAGS="${CXXFLAGS}" srcdir=${srcdir} top_srcdir=${top_srcdir} top_builddir=${top_builddir} ${srcdir}/check-assembly.sh
+TESTS_ENVIRONMENT = CC="${CC}" CFLAGS="${TESTSUITE_CFLAGS} ${CFLAGS}" CXXFLAGS="${CXXFLAGS}" srcdir=${srcdir} top_srcdir=${top_srcdir} top_builddir=${top_builddir} ${srcdir}/check-assembly.sh
 TESTS = ${srcdir}/check-src/check-*.c $(am__append_1)
 EXTRA_DIST = \
 	check-src/		\
diff --git a/configure b/configure
index 0c9136e4..d440a922 100755
--- a/configure
+++ b/configure
@@ -12426,8 +12426,6 @@ if test x$enable_werror = xyes; then
   ADD_CFLAGS="-Werror -W -Wpointer-arith"
 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 :
@@ -12709,6 +12707,44 @@ else
   :
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-error=unused-variable" >&5
+$as_echo_n "checking whether C compiler accepts -Wno-error=unused-variable... " >&6; }
+if ${ax_cv_check_cflags___Wno_error_unused_variable+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -Wno-error=unused-variable"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags___Wno_error_unused_variable=yes
+else
+  ax_cv_check_cflags___Wno_error_unused_variable=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Wno_error_unused_variable" >&5
+$as_echo "$ax_cv_check_cflags___Wno_error_unused_variable" >&6; }
+if test x"$ax_cv_check_cflags___Wno_error_unused_variable" = xyes; then :
+  TESTSUITE_CFLAGS="$TESTSUITE_CFLAGS -Wno-error=unused-variable"
+else
+  :
+fi
+
+
+
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
diff --git a/configure.ac b/configure.ac
index 2f82bfe9..f0031d8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([asn1c], [0.9.26], [vlm@lionet.info])
+AC_INIT([asn1c], [0.9.27], [vlm@lionet.info])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -33,25 +33,28 @@ if test x$enable_werror = xyes; then
   TESTSUITE_CFLAGS="-Werror -W -Wpointer-arith"
   ADD_CFLAGS="-Werror -W -Wpointer-arith"
 fi
-AC_SUBST(ADD_CFLAGS)
-AC_SUBST(TESTSUITE_CFLAGS)
 
 AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
 AX_CHECK_COMPILE_FLAG([-Wcast-qual], [CFLAGS="$CFLAGS -Wcast-qual"])
 AX_CHECK_COMPILE_FLAG([-Wchar-subscripts],
-                      [CFLAGS="$CFLAGS -Wchar-subscripts"])
+      [CFLAGS="$CFLAGS -Wchar-subscripts"])
 AX_CHECK_COMPILE_FLAG([-Wmissing-prototypes],
-                      [CFLAGS="$CFLAGS -Wmissing-prototypes"])
+      [CFLAGS="$CFLAGS -Wmissing-prototypes"])
 AX_CHECK_COMPILE_FLAG([-Wmissing-declarations],
-                      [CFLAGS="$CFLAGS -Wmissing-declarations"])
+      [CFLAGS="$CFLAGS -Wmissing-declarations"])
 
 dnl There are legitimate uses for these features, disable warnings/errors.
 AX_CHECK_COMPILE_FLAG([-Wno-error=cast-align],
-                      [CFLAGS="$CFLAGS -Wno-error=cast-align"])
+      [CFLAGS="$CFLAGS -Wno-error=cast-align"])
 AX_CHECK_COMPILE_FLAG([-Wno-error=visibility],
-                      [CFLAGS="$CFLAGS -Wno-error=visibility"])
+      [CFLAGS="$CFLAGS -Wno-error=visibility"])
 AX_CHECK_COMPILE_FLAG([-Wno-error=parentheses-equality],
-                      [CFLAGS="$CFLAGS -Wno-error=parentheses-equality"])
+      [CFLAGS="$CFLAGS -Wno-error=parentheses-equality"])
+AX_CHECK_COMPILE_FLAG([-Wno-error=unused-variable],
+      [TESTSUITE_CFLAGS="$TESTSUITE_CFLAGS -Wno-error=unused-variable"])
+
+AC_SUBST(ADD_CFLAGS)
+AC_SUBST(TESTSUITE_CFLAGS)
 
 dnl Checks for header files.
 AC_HEADER_STDC
-- 
cgit v1.2.3