Pre 2.92

[fw/sdcc] / configure.in

diff --git a/configure.in b/configure.in
index 4f235909ac623d25edd718936fe94a74d614bf58..eef18b70ff7aa30e2b2e5939d7ccfae984d9f865 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -177,9 +177,9 @@ if test "${datadir}" = "\${prefix}/share"; then
 else
   sdcc_datadir=${datadir}
 fi
-AC_DEFINE_UNQUOTED(STANDARD_INCLUDE_DIR, "${sdcc_datadir}/sdcc51inc")
-AC_DEFINE_UNQUOTED(SDCC_INCLUDE_DIR, "${sdcc_datadir}/sdcc51inc")
-AC_DEFINE_UNQUOTED(SDCC_LIB_DIR, "${sdcc_datadir}/sdcc51lib")
+AC_DEFINE_UNQUOTED(STANDARD_INCLUDE_DIR, "${sdcc_datadir}/include")
+AC_DEFINE_UNQUOTED(SDCC_INCLUDE_DIR, "${sdcc_datadir}/include")
+AC_DEFINE_UNQUOTED(SDCC_LIB_DIR, "${sdcc_datadir}/lib")
 AC_DEFINE_UNQUOTED(STD_LIB, "libsdcc")
 AC_DEFINE_UNQUOTED(STD_INT_LIB, "libint")
 AC_DEFINE_UNQUOTED(STD_LONG_LIB, "liblong")
@@ -189,14 +189,19 @@ AC_DEFINE_UNQUOTED(PREFIX, "${prefix}")
 AC_DEFINE_UNQUOTED(DATADIR, "${sdcc_datadir}")
 AC_DEFINE_UNQUOTED(SRCDIR, "${config_in}")
 
+# mlh: dont compile libgc if it's available locally
+AC_CHECK_LIB(gc,GC_malloc,HAVE_LIBGC=1)
+AC_SUBST(HAVE_LIBGC)
 
 # Generating output files
 # ===========================================================================
-AC_CONFIG_SUBDIRS(sim/msc51)
+AC_CONFIG_SUBDIRS(sim/ucsim)
 AC_OUTPUT(main.mk:main_in.mk
 support/gc/Makefile
 src/Makefile
 as/mcs51/Makefile
+as/z80/Makefile
+link/z80/Makefile
 support/cpp/Makefile
 device/include/Makefile
 device/lib/Makefile