fixes to make disassembly work under macos (with macports binutils installed)

Makefile.in

@@ -81,14 +81,16 @@ VPATH := $(addprefix $(src_dir)/, $(sprojs_enabled))
 # C++ compiler
 #  - CPPFLAGS : flags for the preprocessor (eg. -I,-D)
 #  - CXXFLAGS : flags for C++ compiler (eg. -Wall,-g,-O3)
+#  - INCDIRS : extra include directories (eg. -I/foo/bar)
 
 CC            := @CC@
 CXX           := @CXX@
 CPPFLAGS      := @CPPFLAGS@
 CXXFLAGS      := @CXXFLAGS@
-COMPILE       := $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) \
+INCDIRS       := @INCDIRS@
+COMPILE       := $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) $(INCDIRS) \
                  $(sprojs_include)
-COMPILE_C     := $(CC)  -MMD -MP $(CPPFLAGS) $(CXXFLAGS) \
+COMPILE_C     := $(CC)  -MMD -MP $(CPPFLAGS) $(CXXFLAGS) $(INCDIRS) \
                  $(sprojs_include)
 # Linker
 #  - LDFLAGS : Flags for the linker (eg. -L)

riscv/riscv.ac

@@ -21,12 +21,17 @@ AS_IF([test "x$enable_vec" != "xno"], [
 libopc=`dirname \`which riscv-gcc\``/../`$ac_config_guess`/riscv/lib/libopcodes.a
 AC_CHECK_FILES([$libopc],[have_libopcodes="yes"],[have_libopcodes="no"])
 
-AC_SEARCH_LIBS([bfd_init],[bfd],[],[have_libopcodes="no"])
+libbfd="/opt/local/lib/libbfd.dylib"
+AC_SEARCH_LIBS([bfd_init],[bfd],[],[
+    AC_CHECK_FILES([$libbfd], [libopc="$libopc $libbfd" incopc="/opt/local/include"], [have_libopcodes="no"])
+])
 
 AS_IF([test "$have_libopcodes" = "no"],[
   AC_MSG_WARN([Could not find opcodes library])
   AC_MSG_WARN([Build will not include disassembly support])
 ],[
   LIBS="$libopc $LIBS"
+  INCDIRS="-I$incopc"
   AC_DEFINE([RISCV_HAVE_LIBOPCODES],,[Define if libopcodes exists])
 ])
+AC_SUBST(INCDIRS)