X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=configure.in;h=1443114dd0f16b6e6b40f71fbc37916de724dd7d;hb=29779804200986ce903b5086441b49265a122dc5;hp=346f815a3a3a68ed9735a31c953181ed2eb05993;hpb=096e3b7bc63ca95b9caf6e39d6914b258b588ac7;p=fw%2Fsdcc diff --git a/configure.in b/configure.in index 346f815a..1443114d 100755 --- a/configure.in +++ b/configure.in @@ -37,12 +37,21 @@ AC_PROG_CXX AC_PROG_CPP AC_PROG_INSTALL AC_PROG_RANLIB -AC_PROG_YACC(bison, :) AC_PROG_LEX(flex, :) +AC_CHECK_PROG(YACC, bison, bison -y, :) AC_CHECK_PROG(AUTOCONF, autoconf, autoconf, :) AC_CHECK_PROG(AS, as, as, :) AC_CHECK_PROG(CP, cp, cp, :) +AC_DEFUN(SDCC_REQUIRE_PROG, +[if test "$1" = ":"; then + AC_MSG_ERROR([Cannot find required program $2.]) + fi +]) + +SDCC_REQUIRE_PROG($YACC, bison) +SDCC_REQUIRE_PROG($LEX, lex) + AC_LANG_C # Checking for header files. @@ -51,6 +60,7 @@ AC_HEADER_STDC AC_CHECK_HEADERS(getopt.h) AC_CHECK_HEADERS(unistd.h) AC_CHECK_HEADERS(endian.h) +AC_CHECK_HEADERS(malloc.h) AC_CHECK_HEADERS(sys/isa_defs.h) AC_CHECK_HEADERS(sys/socket.h) AC_HEADER_DIRENT @@ -184,14 +194,12 @@ AC_DEFINE_UNQUOTED(STD_LIB, "libsdcc") AC_DEFINE_UNQUOTED(STD_INT_LIB, "libint") AC_DEFINE_UNQUOTED(STD_LONG_LIB, "liblong") AC_DEFINE_UNQUOTED(STD_FP_LIB, "libfloat") +AC_DEFINE_UNQUOTED(STD_DS390_LIB, "libds390") 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) # Now handle the port selection AC_ARG_ENABLE(z80-port,--disable-z80-port: Excludes the z80 port) @@ -225,11 +233,11 @@ fi # Generating output files # =========================================================================== AC_CONFIG_SUBDIRS(sim/ucsim) +AC_CONFIG_SUBDIRS(packihx) # MLH: removed as the rules are already in Makefile.common #as/z80/Makefile #link/z80/Makefile AC_OUTPUT(main.mk:main_in.mk -support/gc/Makefile src/Makefile as/mcs51/Makefile support/cpp/Makefile