From 20847a3ff584326fed503c9659267ebfa37020f6 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Tue, 4 Oct 2011 08:48:37 -0400
Subject: [PATCH] Fix autoconf warnings, bug396.

---
 Changes      | 2 ++
 configure.ac | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Changes b/Changes
index 69beabd23..def59547f 100644
--- a/Changes
+++ b/Changes
@@ -9,6 +9,8 @@ indicates the contributor was also the author of the fix; Thanks!
 
 **** Fix MSVC compile warning with trunc/round, bug394. [Amir Gonnen]
 
+**** Fix autoconf warnings, bug396.  [R. Diez]
+
 
 * Verilator 3.821 2011/09/14
 
diff --git a/configure.ac b/configure.ac
index 4c23ac24d..bdfa9dd14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ dnl General Public License Version 3 or the Perl Artistic License Version 2.0.
 
 AC_INIT(src/Verilator.cpp)
 AC_CONFIG_HEADER(src/config_build.h)
+AC_CONFIG_FILES(Makefile src/Makefile src/Makefile_obj include/verilated.mk)
 
 dnl Special Substitutions
 AC_ARG_ENABLE(defenv,
@@ -27,9 +28,11 @@ AC_PROG_INSTALL
 
 AC_LANG_PUSH(C++)
 AC_MSG_CHECKING([that C++ compiler can compile simple program])
-AC_TRY_RUN([int main() { return 0; }],
+AC_RUN_IFELSE(
+           [AC_LANG_SOURCE([int main() { return 0; }])],
            AC_MSG_RESULT(yes),
-           AC_MSG_RESULT(no);AC_MSG_ERROR([a working C++ compiler is required]))
+           AC_MSG_RESULT(no);AC_MSG_ERROR([a working C++ compiler is required]),
+	   AC_MSG_RESULT(yes))
 
 AC_PATH_PROG(PERL,perl)
 if test "x$PERL" = "x" ; then
@@ -69,7 +72,7 @@ dnl Other install directories
 pkgdatadir=${datadir}/verilator
 AC_SUBST(pkgdatadir)
 
-AC_OUTPUT(Makefile src/Makefile src/Makefile_obj include/verilated.mk)
+AC_OUTPUT
 
 AC_MSG_RESULT([])
 AC_MSG_RESULT([Now type 'gmake'])