CVS kaffe (robilad): Removed unnecessary checks for network functions
Kaffe CVS <[email protected]>
| Newsgroups | gmane.comp.java.vm.kaffe.general |
|---|---|
| Message-ID | <[email protected]> |
PatchSet 7660 Date: 2008/01/02 21:50:26 Author: robilad Branch: HEAD Tag: (none) Log: Removed unnecessary checks for network functions 2008-01-02 Dalibor Topic <[email protected]> * include/jsyscall.h: Don't include netdb.h. * kaffe/kaffevm/systems/unix-jthreads/Makefile.am (libkthread_la_LIBADD): Removed. * kaffe/kaffevm/systems/unix-pthreads/Makefile.am (libkthread_la_LDADD): Removed. * kaffe/kaffevm/Makefile.am (libkaffe_la_LIBADD): Removed NET_LIBS. * kaffe/kaffevm/systems/win32/winio.c: Removed Ngethostbyname, Ngethostname. * config/i386/drops/md.c: (gethostname, gethostbyname) Removed. * configure.ac: Don't check for gethostname, gethostbyname, connect and netdb.h. (NET_LIBS) Removed. Members: ChangeLog:1.5162->1.5163 Makefile.in:1.300->1.301 configure:1.619->1.620 configure.ac:1.288->1.289 config/Makefile.in:1.248->1.249 config/config.h.in:1.172->1.173 config/i386/drops/md.c:1.2->1.3 include/Makefile.in:1.311->1.312 include/jsyscall.h:1.31->1.32 kaffe/Makefile.in:1.197->1.198 kaffe/jvmpi/Makefile.in:1.122->1.123 kaffe/kaffe/Makefile.in:1.221->1.222 kaffe/kaffeh/Makefile.in:1.202->1.203 kaffe/kaffevm/Makefile.am:1.103->1.104 kaffe/kaffevm/Makefile.in:1.272->1.273 kaffe/kaffevm/boehm-gc/Makefile.in:1.85->1.86 kaffe/kaffevm/gcj/Makefile.in:1.177->1.178 kaffe/kaffevm/intrp/Makefile.in:1.186->1.187 kaffe/kaffevm/jit/Makefile.in:1.196->1.197 kaffe/kaffevm/jit3/Makefile.in:1.166->1.167 kaffe/kaffevm/jni/Makefile.in:1.90->1.91 kaffe/kaffevm/kaffe-gc/Makefile.in:1.84->1.85 kaffe/kaffevm/systems/Makefile.in:1.186->1.187 kaffe/kaffevm/systems/beos-native/Makefile.in:1.177->1.178 kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.41->1.42 kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.183->1.184 kaffe/kaffevm/systems/unix-jthreads/Makefile.am:1.16->1.17 kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.187->1.188 kaffe/kaffevm/systems/unix-pthreads/Makefile.am:1.17->1.18 kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.163->1.164 kaffe/kaffevm/systems/win32/winio.c:1.2->1.3 kaffe/kaffevm/verifier/Makefile.in:1.89->1.90 kaffe/man/Makefile.in:1.184->1.185 kaffe/scripts/Makefile.in:1.228->1.229 kaffe/scripts/bat/Makefile.in:1.177->1.178 kaffe/scripts/compat/Makefile.in:1.205->1.206 kaffe/xprof/Makefile.in:1.152->1.153 libraries/Makefile.in:1.180->1.181 libraries/clib/Makefile.in:1.201->1.202 libraries/clib/awt/Makefile.in:1.195->1.196 libraries/clib/awt/X/Makefile.in:1.190->1.191 libraries/clib/awt/nano-X/Makefile.in:1.62->1.63 libraries/clib/awt/qt/Makefile.in:1.143->1.144 libraries/clib/awt/xynth/Makefile.in:1.18->1.19 libraries/clib/management/Makefile.in:1.199->1.200 libraries/clib/math/Makefile.in:1.193->1.194 libraries/clib/security/Makefile.in:1.165->1.166 libraries/clib/zip/Makefile.in:1.198->1.199 libraries/javalib/Makefile.in:1.592->1.593 libraries/javalib/awt-implementations/Makefile.in:1.74->1.75 libraries/javalib/awt-implementations/kaffe/Makefile.in:1.94->1.95 libraries/javalib/gmp-math/Makefile.in:1.83->1.84 libraries/javalib/vmspecific/Makefile.in:1.25->1.26 libraries/javalib/zlib-zip/Makefile.in:1.20->1.21 replace/Makefile.in:1.140->1.141 test/Makefile.in:1.189->1.190 test/internal/Makefile.in:1.165->1.166 test/jni/Makefile.in:1.95->1.96 test/regression/Makefile.in:1.268->1.269 test/regression/compile_time/Makefile.in:1.117->1.118 test/regression/compiler/Makefile.in:1.101->1.102 test/regression/run_time/Makefile.in:1.116->1.117 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.5162 kaffe/ChangeLog:1.5163 --- kaffe/ChangeLog:1.5162 Wed Jan 2 21:16:25 2008 +++ kaffe/ChangeLog Wed Jan 2 21:50:26 2008 @@ -1,5 +1,24 @@ 2008-01-02 Dalibor Topic <[email protected]> + * include/jsyscall.h: Don't include netdb.h. + + * kaffe/kaffevm/systems/unix-jthreads/Makefile.am + (libkthread_la_LIBADD): Removed. + + * kaffe/kaffevm/systems/unix-pthreads/Makefile.am + (libkthread_la_LDADD): Removed. + + * kaffe/kaffevm/Makefile.am (libkaffe_la_LIBADD): Removed NET_LIBS. + + * kaffe/kaffevm/systems/win32/winio.c: Removed Ngethostbyname, + Ngethostname. + + * config/i386/drops/md.c: (gethostname, gethostbyname) Removed. + * configure.ac: Don't check for gethostname, gethostbyname, connect + and netdb.h. (NET_LIBS) Removed. + +2008-01-02 Dalibor Topic <[email protected]> + * TODO: Removed finished jsyscall task. 2008-01-02 Dalibor Topic <[email protected]> Index: kaffe/Makefile.in diff -u kaffe/Makefile.in:1.300 kaffe/Makefile.in:1.301 --- kaffe/Makefile.in:1.300 Wed Jan 2 17:36:25 2008 +++ kaffe/Makefile.in Wed Jan 2 21:50:27 2008 @@ -202,7 +202,6 @@ MSGMERGE = @MSGMERGE@ M_LIBS = @M_LIBS@ NANOX_CFLAGS = @NANOX_CFLAGS@ -NET_LIBS = @NET_LIBS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OPT_DLOPEN_JAVA_LIBS = @OPT_DLOPEN_JAVA_LIBS@ Index: kaffe/configure diff -u kaffe/configure:1.619 kaffe/configure:1.620 --- kaffe/configure:1.619 Wed Jan 2 21:05:30 2008 +++ kaffe/configure Wed Jan 2 21:50:27 2008 @@ -973,7 +973,6 @@ HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS -NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP @@ -2142,9 +2141,6 @@ >$cache_file fi -ac_func_list="$ac_func_list gethostname" -ac_func_list="$ac_func_list gethostbyname" -ac_func_list="$ac_func_list connect" ac_func_list="$ac_func_list MD2Init" ac_func_list="$ac_func_list MD4Init" ac_func_list="$ac_func_list MD5Init" @@ -2166,7 +2162,6 @@ ac_header_list="$ac_header_list malloc.h" ac_header_list="$ac_header_list memory.h" ac_header_list="$ac_header_list mips/cachectl.h" -ac_header_list="$ac_header_list netdb.h" ac_header_list="$ac_header_list netinet/in.h" ac_header_list="$ac_header_list netinet/in_systm.h" ac_header_list="$ac_header_list netinet/tcp.h" @@ -7097,7 +7092,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7100 "configure"' > conftest.$ac_ext + echo '#line 7095 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9661,11 +9656,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9664: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9659: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9668: \$? = $ac_status" >&5 + echo "$as_me:9663: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9951,11 +9946,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9954: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9949: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9958: \$? = $ac_status" >&5 + echo "$as_me:9953: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10055,11 +10050,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10058: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10053: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10062: \$? = $ac_status" >&5 + echo "$as_me:10057: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12417,7 +12412,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12420 "configure" +#line 12415 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12517,7 +12512,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12520 "configure" +#line 12515 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14941,11 +14936,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14944: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14939: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14948: \$? = $ac_status" >&5 + echo "$as_me:14943: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15045,11 +15040,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15048: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15043: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15052: \$? = $ac_status" >&5 + echo "$as_me:15047: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16622,11 +16617,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16625: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16620: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16629: \$? = $ac_status" >&5 + echo "$as_me:16624: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16726,11 +16721,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16729: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16724: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16733: \$? = $ac_status" >&5 + echo "$as_me:16728: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18930,11 +18925,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18933: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18928: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18937: \$? = $ac_status" >&5 + echo "$as_me:18932: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19220,11 +19215,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19223: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19218: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19227: \$? = $ac_status" >&5 + echo "$as_me:19222: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19324,11 +19319,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19327: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19322: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19331: \$? = $ac_status" >&5 + echo "$as_me:19326: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -25643,7 +25638,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 25646 "configure" */ +/* #line 25641 "configure" */ public class Test { } EOF @@ -29503,363 +29498,6 @@ LIBS="$KSAVE_LIBS" - - - - -for ac_func in $ac_func_list -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 { as_var=$as_ac_var; eval "test \"\${$as_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 <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -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 -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&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 - - - - - - - - - -if test $ac_cv_func_gethostname = no; then - KSAVE_LIBS="$LIBS" -LIBS="$NET_LIBS $KSAVE_LIBS" - -{ echo "$as_me:$LINENO: checking for gethostname in -lnsl" >&5 -echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6; } -if test "${ac_cv_lib_nsl_gethostname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostname (); -int -main () -{ -return gethostname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_nsl_gethostname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_nsl_gethostname=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6; } -if test $ac_cv_lib_nsl_gethostname = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBNSL 1 -_ACEOF - - LIBS="-lnsl $LIBS" - -fi - -NET_LIBS=`echo "$LIBS" | sed "s% $KSAVE_LIBS$%%"` -LIBS="$KSAVE_LIBS" - -fi - - - - - - - - -if test $ac_cv_func_gethostbyname = no; then - KSAVE_LIBS="$LIBS" -LIBS="$NET_LIBS $KSAVE_LIBS" - -{ echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostbyname (); -int -main () -{ -return gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_nsl_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_nsl_gethostbyname=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } -if test $ac_cv_lib_nsl_gethostbyname = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBNSL 1 -_ACEOF - - LIBS="-lnsl $LIBS" - -fi - -NET_LIBS=`echo "$LIBS" | sed "s% $KSAVE_LIBS$%%"` -LIBS="$KSAVE_LIBS" - -fi - - - - - - - - -if test $ac_cv_func_connect = no; then - KSAVE_LIBS="$LIBS" -LIBS="$NET_LIBS $KSAVE_LIBS" - -{ echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } -if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char connect (); -int -main () -{ -return connect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_socket_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_socket_connect=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } -if test $ac_cv_lib_socket_connect = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSOCKET 1 -_ACEOF - - LIBS="-lsocket $LIBS" - -fi - -NET_LIBS=`echo "$LIBS" | sed "s% $KSAVE_LIBS$%%"` -LIBS="$KSAVE_LIBS" - -fi - - KSAVE_LIBS="$LIBS" LIBS="$ZIP_LIBS $KSAVE_LIBS" @@ -30107,6 +29745,103 @@ +for ac_func in $ac_func_list +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 { as_var=$as_ac_var; eval "test \"\${$as_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 <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +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 +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&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 + + + + + @@ -30742,10 +30477,6 @@ - - - - # check sys/sysctl.h seperately, as it requires other headers on at least OpenBSD for ac_header in sys/sysctl.h @@ -45941,7 +45672,7 @@ HAVE_JASMIN_FALSE!$HAVE_JASMIN_FALSE$ac_delim KAFFE_LIBS!$KAFFE_LIBS$ac_delim M_LIBS!$M_LIBS$ac_delim -NET_LIBS!$NET_LIBS$ac_delim +ZIP_LIBS!$ZIP_LIBS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -45983,7 +45714,6 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -ZIP_LIBS!$ZIP_LIBS$ac_delim LIBADD_GMP!$LIBADD_GMP$ac_delim USE_GMP!$USE_GMP$ac_delim SECURITY_LIBS!$SECURITY_LIBS$ac_delim @@ -46052,7 +45782,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 Index: kaffe/configure.ac diff -u kaffe/configure.ac:1.288 kaffe/configure.ac:1.289 --- kaffe/configure.ac:1.288 Wed Jan 2 17:56:30 2008 +++ kaffe/configure.ac Wed Jan 2 21:50:27 2008 @@ -895,21 +895,6 @@ AC_CHECK_LIBRARY([gc],[GC_free],[VM_LIBS]) -dnl Check for libraries for net library. -AC_CHECK_FUNCS_ONCE(gethostname) -if test $ac_cv_func_gethostname = no; then - AC_CHECK_LIBRARY(nsl, gethostname, NET_LIBS) -fi -AC_CHECK_FUNCS_ONCE(gethostbyname) -if test $ac_cv_func_gethostbyname = no; then - AC_CHECK_LIBRARY(nsl, gethostbyname, NET_LIBS) -fi -AC_CHECK_FUNCS_ONCE(connect) -if test $ac_cv_func_connect = no; then - AC_CHECK_LIBRARY(socket, connect, NET_LIBS) -fi -AC_SUBST(NET_LIBS) - dnl Check for libraries for zip library. AC_CHECK_LIBRARY(z,deflate,ZIP_LIBS) ZIP_LIBS="$CTLIBS $ZIP_LIBS" @@ -951,7 +936,6 @@ malloc.h \ memory.h \ mips/cachectl.h \ -netdb.h \ netinet/in.h \ netinet/in_systm.h \ netinet/tcp.h \ Index: kaffe/config/Makefile.in diff -u kaffe/config/Makefile.in:1.248 kaffe/config/Makefile.in:1.249 --- kaffe/config/Makefile.in:1.248 Wed Jan 2 21:05:33 2008 +++ kaffe/config/Makefile.in Wed Jan 2 21:50:28 2008 @@ -176,7 +176,6 @@ MSGMERGE = @MSGMERGE@ M_LIBS = @M_LIBS@ NANOX_CFLAGS = @NANOX_CFLAGS@ -NET_LIBS = @NET_LIBS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OPT_DLOPEN_JAVA_LIBS = @OPT_DLOPEN_JAVA_LIBS@ Index: kaffe/config/config.h.in diff -u kaffe/config/config.h.in:1.172 kaffe/config/config.h.in:1.173 --- kaffe/config/config.h.in:1.172 Wed Jan 2 17:56:32 2008 +++ kaffe/config/config.h.in Wed Jan 2 21:50:29 2008 @@ -67,9 +67,6 @@ /* Does mprotect support protecting region not covered by mmap ? */ #undef HAVE_COMPATIBLE_MPROTECT -/* Define to 1 if you have the `connect' function. */ -#undef HAVE_CONNECT - /* Define to 1 if you have the <crt_externs.h> header file. */ #undef HAVE_CRT_EXTERNS_H @@ -148,12 +145,6 @@ /* Define to 1 if you have the `getcwd' function. */ #undef HAVE_GETCWD -/* Define to 1 if you have the `gethostbyname' function. */ -#undef HAVE_GETHOSTBYNAME - -/* Define to 1 if you have the `gethostname' function. */ -#undef HAVE_GETHOSTNAME - /* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE @@ -273,18 +264,12 @@ /* Define to 1 if you have the `mw' library (-lmw). */ #undef HAVE_LIBMW -/* Define to 1 if you have the `nsl' library (-lnsl). */ -#undef HAVE_LIBNSL - /* Define to 1 if you have the `png' library (-lpng). */ #undef HAVE_LIBPNG /* Define to 1 if you have the `pthread' library (-lpthread). */ #undef HAVE_LIBPTHREAD -/* Define to 1 if you have the `socket' library (-lsocket). */ -#undef HAVE_LIBSOCKET - /* Define to 1 if you have the `ungif' library (-lungif). */ #undef HAVE_LIBUNGIF @@ -374,9 +359,6 @@ /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ #undef HAVE_NDIR_H - -/* Define to 1 if you have the <netdb.h> header file. */ -#undef HAVE_NETDB_H /* Define to 1 if you have the <netinet/in.h> header file. */ #undef HAVE_NETINET_IN_H Index: kaffe/config/i386/drops/md.c diff -u kaffe/config/i386/drops/md.c:1.2 kaffe/config/i386/drops/md.c:1.3 --- kaffe/config/i386/drops/md.c:1.2 Sun Nov 12 13:45:04 2006 +++ kaffe/config/i386/drops/md.c Wed Jan 2 21:50:29 2008 @@ -15,7 +15,6 @@ #include <string.h> /* memcpy, str* */ #include <stdlib.h> /* malloc, free */ #include <fcntl.h> /* O_RDONLY */ -#include <netdb.h> /* gethostname, getservbyname, ... */ #include <signal.h> /* kill */ #ifdef USE_UCLIBC #include <unistd.h> /* environ */ @@ -53,11 +52,6 @@ int h_errno = 0; #endif -int gethostname(char *name, size_t len) -{ - LOG("to do : len=%d name=%s ", len, name); - return 0; -} struct servent *getservbyname (UNUSED const char *__name, UNUSED const char *__proto) { @@ -114,12 +108,6 @@ } long sysconf(int name UNUSED) { - LOG("to do"); - return 0; -} - -struct hostent *gethostbyname (UNUSED const char *__name) -{ LOG("to do"); return 0; } Index: kaffe/include/Makefile.in diff -u kaffe/include/Makefile.in:1.311 kaffe/include/Makefile.in:1.312 --- kaffe/include/Makefile.in:1.311 Wed Jan 2 21:05:34 2008 +++ kaffe/include/Makefile.in Wed Jan 2 21:50:29 2008 @@ -191,7 +191,6 @@ MSGMERGE = @MSGMERGE@ M_LIBS = @M_LIBS@ NANOX_CFLAGS = @NANOX_CFLAGS@ -NET_LIBS = @NET_LIBS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OPT_DLOPEN_JAVA_LIBS = @OPT_DLOPEN_JAVA_LIBS@ Index: kaffe/include/jsyscall.h diff -u kaffe/include/jsyscall.h:1.31 kaffe/include/jsyscall.h:1.32 --- kaffe/include/jsyscall.h:1.31 Wed Jan 2 20:34:01 2008 +++ kaffe/include/jsyscall.h Wed Jan 2 21:50:29 2008 @@ -18,10 +18,6 @@ #include "config.h" *** Patch too long, truncated ***