autoreconf 126beb482ff6 ("Install pkg-config files for Spike")

[riscv-isa-sim.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 335100bc78f596da344750aeb45af7b08af0bbc8..d0c26b6a1c2affa7a0c659251f0f060ce1f3418d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,7 @@ m4_define( proj_version, [?])
 #-------------------------------------------------------------------------
 
 AC_INIT(proj_name,proj_version,proj_maintainer,proj_abbreviation)
+AC_LANG_CPLUSPLUS
 AC_CONFIG_SRCDIR([riscv/common.h])
 AC_CONFIG_AUX_DIR([scripts])
 AC_CANONICAL_BUILD
@@ -59,7 +60,6 @@ AC_CHECK_TOOL([RANLIB],[ranlib])
 # via the makefile.
 
 MCPPBS_PROG_INSTALL
-MCPPBS_PROG_RUN
 
 #-------------------------------------------------------------------------
 # Checks for header files
@@ -71,8 +71,8 @@ AC_HEADER_STDC
 # Default compiler flags
 #-------------------------------------------------------------------------
 
-AC_SUBST([CFLAGS],  ["-Wall -O2 -Wno-unused"])
-AC_SUBST([CXXFLAGS],["-Wall -O2 -std=c++0x"])
+AC_SUBST([CFLAGS],  ["-Wall -Wno-unused -O2"])
+AC_SUBST([CXXFLAGS],["-Wall -Wno-unused -O2 -std=c++11"])
 
 #-------------------------------------------------------------------------
 # MCPPBS subproject list
@@ -81,7 +81,7 @@ AC_SUBST([CXXFLAGS],["-Wall -O2 -std=c++0x"])
 # The '*' suffix indicates an optional subproject. The '**' suffix
 # indicates an optional subproject which is also the name of a group.
 
-MCPPBS_SUBPROJECTS([ riscv, softfloat, softfloat_riscv ])
+MCPPBS_SUBPROJECTS([ riscv, hwacha, dummy_rocc, softfloat, spike_main ])
 
 #-------------------------------------------------------------------------
 # MCPPBS subproject groups
@@ -100,4 +100,10 @@ MCPPBS_SUBPROJECTS([ riscv, softfloat, softfloat_riscv ])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([riscv-spike.pc])
+AC_CONFIG_FILES([riscv-riscv.pc])
+AC_CONFIG_FILES([riscv-hwacha.pc])
+AC_CONFIG_FILES([riscv-softfloat.pc])
+AC_CONFIG_FILES([riscv-dummy_rocc.pc])
+AC_CONFIG_FILES([riscv-spike_main.pc])
 AC_OUTPUT