X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2Fconfigure;h=628cd7d5ea6dabfa5ec89e0f2fef9fbf00e174d7;hb=90f4aedaef8a2310573eef905f95c671f84e5cde;hp=48b58e58519d30f6772a4f22409e5ee9bcfad469;hpb=c42e9051755428d14eb620abc9eda86d43479a1a;p=fw%2Fsdcc diff --git a/sim/ucsim/configure b/sim/ucsim/configure index 48b58e58..628cd7d5 100755 --- a/sim/ucsim/configure +++ b/sim/ucsim/configure @@ -468,7 +468,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK VERSION VERSIONHI VERSIONLO VERSIONP docdir enable_ucsim enable_dlso enable_51 enable_avr enable_z80 enable_hc08 enable_xa enable_serio CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB STRIP build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS ac_ct_CC LN_S ECHO ac_ct_STRIP CPP EGREP LIBTOOL LIBTOOL_DEPS LEX LEXLIB LEX_OUTPUT_ROOT YACC BISON_PLUS_PLUS dl_ok DL panel_ok curses_ok CURSES_LIBS M_OR_MM SHAREDLIB PICOPT dlso_ok LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK VERSION VERSIONHI VERSIONLO VERSIONP docdir enable_ucsim enable_dlso enable_51 enable_avr enable_z80 enable_hc08 enable_xa enable_serio CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB STRIP build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS ac_ct_CC LN_S ECHO ac_ct_STRIP CPP EGREP LIBTOOL LIBTOOL_DEPS LEX LEXLIB LEX_OUTPUT_ROOT YACC BISON_PLUS_PLUS WINSOCK_AVAIL dl_ok DL panel_ok curses_ok CURSES_LIBS M_OR_MM SHAREDLIB PICOPT dlso_ok LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1649,7 +1649,7 @@ if test "${enable_portmon+set}" = set; then enable_serio="yes" fi else - enable_serio="yes" + enable_serio="no" fi; @@ -8672,7 +8672,7 @@ fi fi if test ${LEX} = "flex"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_FLEX 1 _ACEOF @@ -8939,7 +8939,9 @@ _ACEOF fi -for ac_header in getopt.h + + +for ac_header in getopt.h unistd.h termios.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -9089,21 +9091,18 @@ fi done -for ac_header in unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if test "${ac_cv_header_curses_h+set}" = set; then + echo "$as_me:$LINENO: checking for curses.h" >&5 +echo $ECHO_N "checking for curses.h... $ECHO_C" >&6 +if test "${ac_cv_header_curses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5 +echo "${ECHO_T}$ac_cv_header_curses_h" >&6 else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking curses.h usability" >&5 +echo $ECHO_N "checking curses.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9111,7 +9110,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <$ac_header> +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -9147,15 +9146,15 @@ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking curses.h presence" >&5 +echo $ECHO_N "checking curses.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -9189,25 +9188,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: curses.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: curses.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: curses.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: curses.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: curses.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: curses.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: curses.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------------------ ## @@ -9218,26 +9217,31 @@ _ASBOX sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +echo "$as_me:$LINENO: checking for curses.h" >&5 +echo $ECHO_N "checking for curses.h... $ECHO_C" >&6 +if test "${ac_cv_header_curses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=\$ac_header_preproc" + ac_cv_header_curses_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5 +echo "${ECHO_T}$ac_cv_header_curses_h" >&6 fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +if test $ac_cv_header_curses_h = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_CURSES_H 1 _ACEOF + curses_h_ok=yes +else + curses_h_ok=no + fi -done + +ucsim_cv_socket="unknown" if test "${ac_cv_header_sys_socket_h+set}" = set; then echo "$as_me:$LINENO: checking for sys/socket.h" >&5 echo $ECHO_N "checking for sys/socket.h... $ECHO_C" >&6 @@ -9376,21 +9380,193 @@ echo "${ECHO_T}$ac_cv_header_sys_socket_h" >&6 fi if test $ac_cv_header_sys_socket_h = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_SYS_SOCKET_H 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF #define SOCKET_AVAIL 1 +_ACEOF + + cat >>confdefs.h <<_ACEOF +#define UCSOCKET_T int +_ACEOF + + ucsim_cv_socket="" + +fi + + + +WINSOCK_AVAIL=0 +if test $ucsim_cv_socket = unknown; then + if test "${ac_cv_header_winsock2_h+set}" = set; then + echo "$as_me:$LINENO: checking for winsock2.h" >&5 +echo $ECHO_N "checking for winsock2.h... $ECHO_C" >&6 +if test "${ac_cv_header_winsock2_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_winsock2_h" >&5 +echo "${ECHO_T}$ac_cv_header_winsock2_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking winsock2.h usability" >&5 +echo $ECHO_N "checking winsock2.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking winsock2.h presence" >&5 +echo $ECHO_N "checking winsock2.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: winsock2.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: winsock2.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: winsock2.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: winsock2.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: winsock2.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: winsock2.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: winsock2.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: winsock2.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: winsock2.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: winsock2.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: winsock2.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: winsock2.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: winsock2.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: winsock2.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: winsock2.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: winsock2.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for winsock2.h" >&5 +echo $ECHO_N "checking for winsock2.h... $ECHO_C" >&6 +if test "${ac_cv_header_winsock2_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_winsock2_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_winsock2_h" >&5 +echo "${ECHO_T}$ac_cv_header_winsock2_h" >&6 + +fi +if test $ac_cv_header_winsock2_h = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_WINSOCK2_H 1 _ACEOF cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_SOCKET_H 1 +#define SOCKET_AVAIL 1 _ACEOF - cat >conftest.$ac_ext <<_ACEOF + cat >>confdefs.h <<_ACEOF +#define UCSOCKET_T SOCKET +_ACEOF + + ucsim_cv_socket="" + WINSOCK_AVAIL=1 + +fi + + +fi + + +if test $ucsim_cv_socket != unknown; then + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include <$ucsim_cv_socket> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | @@ -9407,8 +9583,10 @@ _ACEOF fi rm -f conftest* - fi +cat >>confdefs.h <<_ACEOF +#define HEADER_SOCKET ${ucsim_cv_socket} +_ACEOF if test "${ac_cv_header_dlfcn_h+set}" = set; then @@ -9896,6 +10074,24 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include +#ifdef FD_ZERO +yes +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then + ucsim_cv_fd="" +fi +rm -f conftest* + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + #include #ifdef FD_ZERO yes @@ -9939,7 +10135,7 @@ yes _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "yes" >/dev/null 2>&1; then - ucsim_cv_fd="" + ucsim_cv_fd="" fi rm -f conftest* @@ -9947,19 +10143,13 @@ fi echo "$as_me:$LINENO: result: $ucsim_cv_fd" >&5 echo "${ECHO_T}$ucsim_cv_fd" >&6 -cat >>confdefs.h <<\_ACEOF -#define FD_HEADER_OK 0 -_ACEOF - +ucsim_cv_header_ok=0 if echo $ucsim_cv_fd|grep time >/dev/null 2>&1; then cat >>confdefs.h <<\_ACEOF #define FD_NEED_TIME_H 1 _ACEOF -cat >>confdefs.h <<\_ACEOF -#define FD_HEADER_OK 1 -_ACEOF - +ucsim_cv_header_ok=1 else cat >>confdefs.h <<\_ACEOF #define FD_NEED_TIME_H 0 @@ -9971,10 +10161,7 @@ cat >>confdefs.h <<\_ACEOF #define FD_NEED_TYPES_H 1 _ACEOF -cat >>confdefs.h <<\_ACEOF -#define FD_HEADER_OK 1 -_ACEOF - +ucsim_cv_header_ok=1 else cat >>confdefs.h <<\_ACEOF #define FD_NEED_TYPES_H 0 @@ -9986,17 +10173,30 @@ cat >>confdefs.h <<\_ACEOF #define FD_NEED_SELECT_H 1 _ACEOF +ucsim_cv_header_ok=1 +else cat >>confdefs.h <<\_ACEOF -#define FD_HEADER_OK 1 +#define FD_NEED_SELECT_H 0 _ACEOF +fi +if echo $ucsim_cv_fd|grep winsock2 >/dev/null 2>&1; then +cat >>confdefs.h <<\_ACEOF +#define FD_NEED_WINSOCK2_H 1 +_ACEOF + +ucsim_cv_header_ok=1 else cat >>confdefs.h <<\_ACEOF -#define FD_NEED_SELECT_H 0 +#define FD_NEED_WINSOCK2_H 0 _ACEOF fi +cat >>confdefs.h <<_ACEOF +#define FD_HEADER_OK ${ucsim_cv_header_ok} +_ACEOF + cat >>confdefs.h <<_ACEOF #define HEADER_FD ${ucsim_cv_fd} _ACEOF @@ -10005,6 +10205,9 @@ _ACEOF # Checking for functions/libs # =========================================================================== +if echo $ucsim_cv_socket|grep winsock2 >/dev/null 2>&1; then + LIBS="-lws2_32 $LIBS" +else echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 @@ -10153,6 +10356,8 @@ _ACEOF fi +fi + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 if test "${ac_cv_lib_dl_dlopen+set}" = set; then @@ -10242,7 +10447,11 @@ fi #, #-lcurses) -echo "$as_me:$LINENO: checking for panel_above in -lpanel" >&5 +if test $curses_h_ok != yes; then + panel_ok="no" + curses_ok="no" +else + echo "$as_me:$LINENO: checking for panel_above in -lpanel" >&5 echo $ECHO_N "checking for panel_above in -lpanel... $ECHO_C" >&6 if test "${ac_cv_lib_panel_panel_above+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10308,17 +10517,17 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_panel_panel_above" >&5 echo "${ECHO_T}$ac_cv_lib_panel_panel_above" >&6 if test $ac_cv_lib_panel_panel_above = yes; then panel_ok="yes" -curses_ok="yes" -CURSES_LIBS="-lpanel" + curses_ok="yes" + CURSES_LIBS="-lpanel" else panel_ok="no" -curses_ok="no" + curses_ok="no" fi -if test $curses_ok != yes; then - echo "$as_me:$LINENO: checking for nl in -lcurses" >&5 + if test $curses_ok != yes; then + echo "$as_me:$LINENO: checking for nl in -lcurses" >&5 echo $ECHO_N "checking for nl in -lcurses... $ECHO_C" >&6 if test "${ac_cv_lib_curses_nl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10384,15 +10593,15 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_curses_nl" >&5 echo "${ECHO_T}$ac_cv_lib_curses_nl" >&6 if test $ac_cv_lib_curses_nl = yes; then curses_ok="yes" - CURSES_LIBS="-lcurses" + CURSES_LIBS="-lcurses" else curses_ok="no" fi -fi + fi -if test $curses_ok != yes; then - echo "$as_me:$LINENO: checking for nl in -lncurses" >&5 + if test $curses_ok != yes; then + echo "$as_me:$LINENO: checking for nl in -lncurses" >&5 echo $ECHO_N "checking for nl in -lncurses... $ECHO_C" >&6 if test "${ac_cv_lib_ncurses_nl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10458,11 +10667,12 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_nl" >&5 echo "${ECHO_T}$ac_cv_lib_ncurses_nl" >&6 if test $ac_cv_lib_ncurses_nl = yes; then curses_ok="yes" - CURSES_LIBS="-lncurses" + CURSES_LIBS="-lncurses" else curses_ok="no" fi + fi fi @@ -10773,6 +10983,108 @@ fi done +for ac_func in _vsnprintf +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + for ac_func in vasprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -11432,7 +11744,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include +#include ${ucsim_cv_socket} int main () { @@ -11744,9 +12056,9 @@ esac 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 @@ -11823,9 +12135,9 @@ else gopt="-g" fi if test "$CXXFLAGS"x = x ;then - CXXFLAGS="$gopt" + CXXFLAGS="$gopt" else - CXXFLAGS="$CXXFLAGS $gopt" + CXXFLAGS="$CXXFLAGS $gopt" fi @@ -11901,7 +12213,7 @@ echo "$as_me:$LINENO: result: $ucsim_cv_CXXfpic" >&5 echo "${ECHO_T}$ucsim_cv_CXXfpic" >&6 if test "$ucsim_cv_CXXfpic" = "yes"; then - PICOPT="-fpic" + PICOPT="-fpic" fi fi if test "$PICOPT"x != "x"; then @@ -11911,7 +12223,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 @@ -14069,13 +14381,13 @@ _ACEOF 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 @@ -14083,24 +14395,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" } @@ -14241,9 +14553,10 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -14833,6 +15146,7 @@ s,@LEXLIB@,$LEXLIB,;t t s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t s,@YACC@,$YACC,;t t s,@BISON_PLUS_PLUS@,$BISON_PLUS_PLUS,;t t +s,@WINSOCK_AVAIL@,$WINSOCK_AVAIL,;t t s,@dl_ok@,$dl_ok,;t t s,@DL@,$DL,;t t s,@panel_ok@,$panel_ok,;t t