X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2Fconfigure.in;h=e2c137df1abacb8bfbfb1e7eb65c7dfdc7f3920f;hb=d46f1ad41d63b49a39c6616a9918a29cbc1755e4;hp=600d53cb28ab7f0956442462fe6dddfaffe8abda;hpb=f27da39dbcab5678aca6d8462f1cc37a643f37e9;p=fw%2Fsdcc diff --git a/sim/ucsim/configure.in b/sim/ucsim/configure.in index 600d53cb..e2c137df 100644 --- a/sim/ucsim/configure.in +++ b/sim/ucsim/configure.in @@ -6,8 +6,8 @@ AC_CONFIG_HEADER(ddconfig.h:ddconfig_in.h) AC_PROG_AWK AC_MSG_CHECKING(version of the package) -if test -f .version; then - VERSION=`cat .version` +if test -f ${srcdir}/.version; then + VERSION=`cat ${srcdir}/.version` AC_MSG_RESULT($VERSION) else VERSION="0.0.0" @@ -60,13 +60,13 @@ if test $enable_avr != "no"; then fi, enable_avr="yes") AC_ARG_ENABLE(z80, -[ --enable-z80 compile simulator for Z80], +[ --disable-z80 do not compile simulator for Z80], if test $enable_z80 != "no"; then enable_z80="yes" fi, -enable_z80="no") +enable_z80="yes") AC_ARG_ENABLE(hc08, -[ --enable-hc08 compile simulator for hc08], +[ --disable-hc08 do not compile simulator for hc08], if test $enable_hc08 != "no"; then enable_hc08="yes" fi, @@ -82,7 +82,7 @@ AC_ARG_ENABLE(portmon, if test $enable_serio != "no"; then enable_serio="yes" fi, -enable_serio="yes") +enable_serio="no") AC_SUBST(enable_ucsim) AC_SUBST(enable_dlso) AC_SUBST(enable_51) @@ -136,14 +136,45 @@ fi AC_HEADER_STDC AC_CHECK_HEADERS(getopt.h) AC_CHECK_HEADERS(unistd.h) + +AC_CHECK_HEADER(termios.h, + AC_DEFINE(HAVE_TERMIOS_H) + SERIAL_AVAIL=1, + SERIAL_AVAIL=0 +) +AC_SUBST(SERIAL_AVAIL) + +AC_CHECK_HEADER(curses.h, + AC_DEFINE(HAVE_CURSES_H) + curses_h_ok=yes, + curses_h_ok=no +) + +ucsim_cv_socket="unknown" AC_CHECK_HEADER(sys/socket.h, - AC_DEFINE(SOCKET_AVAIL) - AC_DEFINE(HAVE_SYS_SOCKET_H) - AC_EGREP_HEADER(socklen_t, - sys/socket.h, - AC_DEFINE_UNQUOTED(SOCKLEN_T, socklen_t), - AC_DEFINE_UNQUOTED(SOCKLEN_T, uint)) + AC_DEFINE(HAVE_SYS_SOCKET_H) + AC_DEFINE(SOCKET_AVAIL) + AC_DEFINE_UNQUOTED(UCSOCKET_T, int) + ucsim_cv_socket="" ) + +if test $ucsim_cv_socket = unknown; then + AC_CHECK_HEADER(winsock2.h, + AC_DEFINE(HAVE_WINSOCK2_H) + AC_DEFINE(SOCKET_AVAIL) + AC_DEFINE_UNQUOTED(UCSOCKET_T, SOCKET) + ucsim_cv_socket="" + ) +fi + +if test $ucsim_cv_socket != unknown; then + AC_EGREP_HEADER(socklen_t, + $ucsim_cv_socket, + AC_DEFINE_UNQUOTED(SOCKLEN_T, socklen_t), + AC_DEFINE_UNQUOTED(SOCKLEN_T, uint)) +fi +AC_DEFINE_UNQUOTED(HEADER_SOCKET, ${ucsim_cv_socket}) + AC_CHECK_HEADER(dlfcn.h) AC_HEADER_DIRENT @@ -152,6 +183,11 @@ AC_HEADER_DIRENT AC_CACHE_CHECK(which header file defines FD_ macros, ucsim_cv_fd, [ucsim_cv_fd="unknown" AC_EGREP_CPP(yes, [ +#include +#ifdef FD_ZERO +yes +#endif], ucsim_cv_fd="") +AC_EGREP_CPP(yes, [ #include #ifdef FD_ZERO yes @@ -165,35 +201,47 @@ AC_EGREP_CPP(yes, [ #include #ifdef FD_ZERO yes -#endif], ucsim_cv_fd="")]) +#endif], ucsim_cv_fd="")]) -AC_DEFINE(FD_HEADER_OK, 0) +ucsim_cv_header_ok=0 if echo $ucsim_cv_fd|grep time >/dev/null 2>&1; then AC_DEFINE(FD_NEED_TIME_H, 1) -AC_DEFINE(FD_HEADER_OK, 1) +ucsim_cv_header_ok=1 else AC_DEFINE(FD_NEED_TIME_H, 0) fi if echo $ucsim_cv_fd|grep types >/dev/null 2>&1; then AC_DEFINE(FD_NEED_TYPES_H, 1) -AC_DEFINE(FD_HEADER_OK, 1) +ucsim_cv_header_ok=1 else AC_DEFINE(FD_NEED_TYPES_H, 0) fi if echo $ucsim_cv_fd|grep select >/dev/null 2>&1; then AC_DEFINE(FD_NEED_SELECT_H, 1) -AC_DEFINE(FD_HEADER_OK, 1) +ucsim_cv_header_ok=1 else AC_DEFINE(FD_NEED_SELECT_H, 0) fi +if echo $ucsim_cv_fd|grep winsock2 >/dev/null 2>&1; then +AC_DEFINE(FD_NEED_WINSOCK2_H, 1) +ucsim_cv_header_ok=1 +else +AC_DEFINE(FD_NEED_WINSOCK2_H, 0) +fi +AC_DEFINE_UNQUOTED(FD_HEADER_OK, ${ucsim_cv_header_ok}) AC_DEFINE_UNQUOTED(HEADER_FD, ${ucsim_cv_fd}) # Checking for functions/libs # =========================================================================== -AC_CHECK_LIB(socket,socket) -AC_CHECK_LIB(nsl,xdr_short) +if echo $ucsim_cv_socket|grep winsock2 >/dev/null 2>&1; then + LIBS="-lwsock32 $LIBS" +else + AC_CHECK_LIB(socket,socket) + AC_CHECK_LIB(nsl,xdr_short) +fi + AC_CHECK_LIB(dl,dlopen, dl_ok="yes" DL="-ldl", @@ -201,19 +249,48 @@ dl_ok="no" DL="") AC_SUBST(dl_ok) AC_SUBST(DL) -AC_CHECK_LIB(panel,panel_above, -panel_ok="yes" -curses_ok="yes" -CURSES_LIBS="-lpanel -lcurses" -, -panel_ok="no" -AC_CHECK_LIB(curses,nl, -curses_ok="yes" -CURSES_LIBS="-lcurses" -, -ncurses_ok="no") -, --lcurses) + +#AC_CHECK_LIB(panel,panel_above, +#panel_ok="yes" +#curses_ok="yes" +#CURSES_LIBS="-lpanel -lcurses" +#, +#panel_ok="no" +#AC_CHECK_LIB(curses,nl, +#curses_ok="yes" +#CURSES_LIBS="-lcurses" +#, +#curses_ok="no") +#, +#-lcurses) + +if test $curses_h_ok != yes; then + panel_ok="no" + curses_ok="no" +else + AC_CHECK_LIB(panel,panel_above, + panel_ok="yes" + curses_ok="yes" + CURSES_LIBS="-lpanel", + panel_ok="no" + curses_ok="no" + ) + + if test $curses_ok != yes; then + AC_CHECK_LIB(curses,nl, + curses_ok="yes" + CURSES_LIBS="-lcurses", + curses_ok="no") + fi + + if test $curses_ok != yes; then + AC_CHECK_LIB(ncurses,nl, + curses_ok="yes" + CURSES_LIBS="-lncurses", + curses_ok="no") + fi +fi + AC_SUBST(panel_ok) AC_SUBST(curses_ok) AC_SUBST(CURSES_LIBS) @@ -280,7 +357,7 @@ AC_DEFUN(ucsim_ACCEPT_LENGTH_T, for ac_val in int size_t socklen_t; do CPPFLAGS="$ac_save_CPPFLAGS -DACCEPT_SOCKLEN_T=$ac_val" AC_TRY_COMPILE([#include -#include ], +#include ${ucsim_cv_socket}], [struct sockaddr a; $ac_val len; accept (0, &a, &len);], [ucsim_cv_accept_length_type=$ac_val; break]) done @@ -306,7 +383,7 @@ AC_DEFUN(DD_COPT, [ AC_CACHE_CHECK(whether $$1 accepts -$2,ucsim_cv_$1$2, cat >_test_.c < -void main(void) {} +int main(void) {return(0);} EOF $$1 -v -$2 -c _test_.c 1>&5 2>&5 if test "$?" = "0"; then @@ -361,10 +438,13 @@ AC_SUBST(M_OR_MM) # This is the first time when CFLAGS are set/modified!! DD_COPT(CXX, ggdb) -if test "$ucsim_cv_CXXggdb" = "yes"; then - gopt="-ggdb" -else - gopt="-g" +DD_COPT(CXX, gstabs) +if test "$ucsim_cv_CXXgstabs" = "yes"; then + gopt="-gstabs+ -g3" +elif test "$ucsim_cv_CXXggdb" = "yes"; then + gopt="-ggdb -g3" +else + gopt="-g" fi if test "$CXXFLAGS"x = x ;then CXXFLAGS="$gopt" @@ -395,7 +475,7 @@ fi # nor build .so # Quick + dirty by Bernhard # FIXME -if $CXX -v 2>&1 | grep -i cygwin 1>&5 2>&5; then +if $CXX --version 2>&1 | grep -i cygming 1>&5 2>&5 || $CXX --version 2>&1 | grep -i cygwin 1>&5 2>&5; then PICOPT="" SHAREDLIB="no" fi @@ -488,7 +568,8 @@ AC_DEFINE_UNQUOTED(_M_, "${M}") # Generating output files # =========================================================================== -AC_OUTPUT(main.mk:main_in.mk +AC_OUTPUT(Makefile +main.mk:main_in.mk packages.mk:packages_in.mk sim.src/Makefile cmd.src/Makefile