X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2Fconfigure.in;h=a8c506ec0c1301d7669f4b64b33987b7ab14afd9;hb=a3ab6292ce144f88d1c5a919ee4a72d94e1366f7;hp=172a9634dfc4f81a8ccab631b4d8affe4d87c956;hpb=a8bb05787ea1db826c32df658be9ac091ad1cf76;p=fw%2Fsdcc diff --git a/sim/ucsim/configure.in b/sim/ucsim/configure.in index 172a9634..a8c506ec 100644 --- a/sim/ucsim/configure.in +++ b/sim/ucsim/configure.in @@ -1,5 +1,6 @@ #!/bin/sh +AC_PREREQ(2.60) AC_INIT(.version) AC_CONFIG_HEADER(ddconfig.h:ddconfig_in.h) @@ -118,7 +119,7 @@ AC_SUBST(LIBTOOL_DEPS) AC_PROG_LEX if test ${LEX} = "flex"; then - AC_DEFINE(HAVE_FLEX) + AC_DEFINE(HAVE_FLEX) fi AC_PROG_YACC AC_CHECK_PROG(BISON_PLUS_PLUS, bison++, bison++, :) @@ -134,16 +135,42 @@ if test -d /stuff/include; then fi AC_HEADER_STDC -AC_CHECK_HEADERS(getopt.h) -AC_CHECK_HEADERS(unistd.h) +AC_CHECK_HEADERS(getopt.h unistd.h termios.h) + +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="" ) + +WINSOCK_AVAIL=0 +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="" + WINSOCK_AVAIL=1 + ) +fi +AC_SUBST(WINSOCK_AVAIL) + +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 +179,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 +197,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="-lws2_32 $LIBS" +else + AC_CHECK_LIB(socket,socket) + AC_CHECK_LIB(nsl,xdr_short) +fi + AC_CHECK_LIB(dl,dlopen, dl_ok="yes" DL="-ldl", @@ -216,26 +260,31 @@ AC_SUBST(DL) #, #-lcurses) -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_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") + 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) @@ -244,6 +293,7 @@ AC_SUBST(CURSES_LIBS) AC_FUNC_VPRINTF AC_CHECK_FUNCS(vsnprintf) +AC_CHECK_FUNCS(_vsnprintf) AC_CHECK_FUNCS(vasprintf) AC_CHECK_FUNCS(strlen strcpy strcat strstr strcmp strerror strtok strdup) AC_CHECK_FUNCS(strchr memcpy) @@ -304,7 +354,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 @@ -329,7 +379,6 @@ ucsim_ACCEPT_LENGTH_T AC_DEFUN(DD_COPT, [ AC_CACHE_CHECK(whether $$1 accepts -$2,ucsim_cv_$1$2, cat >_test_.c < int main(void) {return(0);} EOF $$1 -v -$2 -c _test_.c 1>&5 2>&5 @@ -341,6 +390,30 @@ fi rm -f _test_.* a.out) ]) +# DD_COPT_NO_IGNORE macro checks if the compiler specified as the +# 1st parameter supports and doesn't ignore option specified as the +# 2nd parameter +# For example: DD_COPT_NO_IGNORE(CXX, fPIC) + +AC_DEFUN(DD_COPT_NO_IGNORE, [ +AC_CACHE_CHECK(whether $$1 accepts and doesn't ignore -$2,ucsim_cv_$1$2, +cat >_test_.c <&1 1>&5) +if test "$?" = "0"; then + expr "$ucsim_cv_$1$2" : '.*'-$2'.*ignored' 1>&5 2>&5 + if test "$?" = "0"; then + ucsim_cv_$1$2="no" + else + ucsim_cv_$1$2="yes" + fi +else + ucsim_cv_$1$2="no" +fi +rm -f _test_.* a.out) +]) + # Checking characteristics of compilers and other programs # -------------------------------------------------------- @@ -351,7 +424,7 @@ if test "$CC" = "i586-mingw32msvc-gcc"; then ac_cv_c_bigendian=no ac_cv_sizeof_char=1 ac_cv_sizeof_short=2 - ac_cv_sizeof_int=4 + ac_cv_sizeof_int=4 ac_cv_sizeof_long=4 ac_cv_sizeof_long_long=4 fi @@ -362,9 +435,9 @@ then else #echo "CROSS ENDIAN" if $CXX -v 2>&1|grep "mingw" >/dev/null 2>&1; then - ac_cv_c_bigendian=no + ac_cv_c_bigendian=no else - : # FIXME + : # FIXME fi #echo "CROSS ENDIAN DONE" fi @@ -390,13 +463,13 @@ if test "$ucsim_cv_CXXgstabs" = "yes"; then gopt="-gstabs+ -g3" elif test "$ucsim_cv_CXXggdb" = "yes"; then gopt="-ggdb -g3" -else +else gopt="-g" fi if test "$CXXFLAGS"x = x ;then - CXXFLAGS="$gopt" + CXXFLAGS="$gopt" else - CXXFLAGS="$CXXFLAGS $gopt" + CXXFLAGS="$CXXFLAGS $gopt" fi DD_COPT(CXX, pipe) @@ -406,26 +479,18 @@ fi PICOPT="" SHAREDLIB="no" -DD_COPT(CXX, fPIC) +DD_COPT_NO_IGNORE(CXX, fPIC) if test "$ucsim_cv_CXXfPIC" = "yes"; then PICOPT="-fPIC" else - DD_COPT(CXX, fpic) + DD_COPT_NO_IGNORE(CXX, fpic) if test "$ucsim_cv_CXXfpic" = "yes"; then - PICOPT="-fpic" + PICOPT="-fpic" fi fi if test "$PICOPT"x != "x"; then SHAREDLIB="yes" fi -# If this is Cygwin neither use Position Independant Code -# nor build .so -# Quick + dirty by Bernhard -# FIXME -if $CXX -v 2>&1 | grep -i cygwin 1>&5 2>&5; then - PICOPT="" - SHAREDLIB="no" -fi AC_SUBST(SHAREDLIB) AC_SUBST(PICOPT) @@ -447,13 +512,13 @@ AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(long long) else if $CXX -v 2>&1|grep "mingw" >/dev/null 2>&1; then - ac_cv_sizeof_char=1 - ac_cv_sizeof_short=2 - ac_cv_sizeof_int=4 - ac_cv_sizeof_long=4 - ac_cv_sizeof_long_long=4 + ac_cv_sizeof_char=1 + ac_cv_sizeof_short=2 + ac_cv_sizeof_int=4 + ac_cv_sizeof_long=4 + ac_cv_sizeof_long_long=4 else - : # FIXME + : # FIXME fi #echo fi @@ -461,24 +526,24 @@ fi type_name() { if expr "$ac_cv_sizeof_char" '>=' "$1" >/dev/null; then - echo "char" - exit + echo "char" + exit fi if expr "$ac_cv_sizeof_short" '>=' "$1" >/dev/null; then - echo "short" - exit + echo "short" + exit fi if expr "$ac_cv_sizeof_int" '>=' "$1" >/dev/null; then - echo "int" - exit + echo "int" + exit fi if expr "$ac_cv_sizeof_long" '>=' "$1" >/dev/null; then - echo "long" - exit + echo "long" + exit fi if expr "$ac_cv_sizeof_long_long" '>=' "$1" >/dev/null; then - echo "long long" - exit + echo "long long" + exit fi echo "long long" }