pyrox.dev / nixpkgs
lol
fork atom
nixpkgs / pkgs / development / libraries / toolbuslib / mingw.patch
at v206 32 kB view raw
1diff -rc toolbuslib-1.1/configure toolbuslib-1.1-new/configure 2*** toolbuslib-1.1/configure 2008-11-10 13:59:46.000000000 +0100 3--- toolbuslib-1.1-new/configure 2010-08-23 16:53:39.000000000 +0200 4*************** 5*** 20719,21162 **** 6 fi 7 8 9- if test "${ac_cv_header_netdb_h+set}" = set; then 10- echo "$as_me:$LINENO: checking for netdb.h" >&5 11- echo $ECHO_N "checking for netdb.h... $ECHO_C" >&6 12- if test "${ac_cv_header_netdb_h+set}" = set; then 13- echo $ECHO_N "(cached) $ECHO_C" >&6 14- fi 15- echo "$as_me:$LINENO: result: $ac_cv_header_netdb_h" >&5 16- echo "${ECHO_T}$ac_cv_header_netdb_h" >&6 17- else 18- # Is the header compilable? 19- echo "$as_me:$LINENO: checking netdb.h usability" >&5 20- echo $ECHO_N "checking netdb.h usability... $ECHO_C" >&6 21- cat >conftest.$ac_ext <<_ACEOF 22- /* confdefs.h. */ 23- _ACEOF 24- cat confdefs.h >>conftest.$ac_ext 25- cat >>conftest.$ac_ext <<_ACEOF 26- /* end confdefs.h. */ 27- $ac_includes_default 28- #include <netdb.h> 29- _ACEOF 30- rm -f conftest.$ac_objext 31- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 32- (eval $ac_compile) 2>conftest.er1 33- ac_status=$? 34- grep -v '^ *+' conftest.er1 >conftest.err 35- rm -f conftest.er1 36- cat conftest.err >&5 37- echo "$as_me:$LINENO: \$? = $ac_status" >&5 38- (exit $ac_status); } && 39- { ac_try='test -z "$ac_c_werror_flag" 40- || test ! -s conftest.err' 41- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 42- (eval $ac_try) 2>&5 43- ac_status=$? 44- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45- (exit $ac_status); }; } && 46- { ac_try='test -s conftest.$ac_objext' 47- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 48- (eval $ac_try) 2>&5 49- ac_status=$? 50- echo "$as_me:$LINENO: \$? = $ac_status" >&5 51- (exit $ac_status); }; }; then 52- ac_header_compiler=yes 53- else 54- echo "$as_me: failed program was:" >&5 55- sed 's/^/| /' conftest.$ac_ext >&5 56- 57- ac_header_compiler=no 58- fi 59- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 60- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 61- echo "${ECHO_T}$ac_header_compiler" >&6 62- 63- # Is the header present? 64- echo "$as_me:$LINENO: checking netdb.h presence" >&5 65- echo $ECHO_N "checking netdb.h presence... $ECHO_C" >&6 66- cat >conftest.$ac_ext <<_ACEOF 67- /* confdefs.h. */ 68- _ACEOF 69- cat confdefs.h >>conftest.$ac_ext 70- cat >>conftest.$ac_ext <<_ACEOF 71- /* end confdefs.h. */ 72- #include <netdb.h> 73- _ACEOF 74- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 75- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 76- ac_status=$? 77- grep -v '^ *+' conftest.er1 >conftest.err 78- rm -f conftest.er1 79- cat conftest.err >&5 80- echo "$as_me:$LINENO: \$? = $ac_status" >&5 81- (exit $ac_status); } >/dev/null; then 82- if test -s conftest.err; then 83- ac_cpp_err=$ac_c_preproc_warn_flag 84- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 85- else 86- ac_cpp_err= 87- fi 88- else 89- ac_cpp_err=yes 90- fi 91- if test -z "$ac_cpp_err"; then 92- ac_header_preproc=yes 93- else 94- echo "$as_me: failed program was:" >&5 95- sed 's/^/| /' conftest.$ac_ext >&5 96- 97- ac_header_preproc=no 98- fi 99- rm -f conftest.err conftest.$ac_ext 100- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 101- echo "${ECHO_T}$ac_header_preproc" >&6 102- 103- # So? What about this header? 104- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 105- yes:no: ) 106- { echo "$as_me:$LINENO: WARNING: netdb.h: accepted by the compiler, rejected by the preprocessor!" >&5 107- echo "$as_me: WARNING: netdb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} 108- { echo "$as_me:$LINENO: WARNING: netdb.h: proceeding with the compiler's result" >&5 109- echo "$as_me: WARNING: netdb.h: proceeding with the compiler's result" >&2;} 110- ac_header_preproc=yes 111- ;; 112- no:yes:* ) 113- { echo "$as_me:$LINENO: WARNING: netdb.h: present but cannot be compiled" >&5 114- echo "$as_me: WARNING: netdb.h: present but cannot be compiled" >&2;} 115- { echo "$as_me:$LINENO: WARNING: netdb.h: check for missing prerequisite headers?" >&5 116- echo "$as_me: WARNING: netdb.h: check for missing prerequisite headers?" >&2;} 117- { echo "$as_me:$LINENO: WARNING: netdb.h: see the Autoconf documentation" >&5 118- echo "$as_me: WARNING: netdb.h: see the Autoconf documentation" >&2;} 119- { echo "$as_me:$LINENO: WARNING: netdb.h: section \"Present But Cannot Be Compiled\"" >&5 120- echo "$as_me: WARNING: netdb.h: section \"Present But Cannot Be Compiled\"" >&2;} 121- { echo "$as_me:$LINENO: WARNING: netdb.h: proceeding with the preprocessor's result" >&5 122- echo "$as_me: WARNING: netdb.h: proceeding with the preprocessor's result" >&2;} 123- { echo "$as_me:$LINENO: WARNING: netdb.h: in the future, the compiler will take precedence" >&5 124- echo "$as_me: WARNING: netdb.h: in the future, the compiler will take precedence" >&2;} 125- ( 126- cat <<\_ASBOX 127- ## ------------------------------------------ ## 128- ## Report this to the AC_PACKAGE_NAME lists. ## 129- ## ------------------------------------------ ## 130- _ASBOX 131- ) | 132- sed "s/^/$as_me: WARNING: /" >&2 133- ;; 134- esac 135- echo "$as_me:$LINENO: checking for netdb.h" >&5 136- echo $ECHO_N "checking for netdb.h... $ECHO_C" >&6 137- if test "${ac_cv_header_netdb_h+set}" = set; then 138- echo $ECHO_N "(cached) $ECHO_C" >&6 139- else 140- ac_cv_header_netdb_h=$ac_header_preproc 141- fi 142- echo "$as_me:$LINENO: result: $ac_cv_header_netdb_h" >&5 143- echo "${ECHO_T}$ac_cv_header_netdb_h" >&6 144- 145- fi 146- if test $ac_cv_header_netdb_h = yes; then 147- : 148- else 149- { { echo "$as_me:$LINENO: error: \"*** no netdb.h\"" >&5 150- echo "$as_me: error: \"*** no netdb.h\"" >&2;} 151- { (exit 1); exit 1; }; } 152- fi 153- 154- 155- if test "${ac_cv_header_netinet_in_h+set}" = set; then 156- echo "$as_me:$LINENO: checking for netinet/in.h" >&5 157- echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6 158- if test "${ac_cv_header_netinet_in_h+set}" = set; then 159- echo $ECHO_N "(cached) $ECHO_C" >&6 160- fi 161- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 162- echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6 163- else 164- # Is the header compilable? 165- echo "$as_me:$LINENO: checking netinet/in.h usability" >&5 166- echo $ECHO_N "checking netinet/in.h usability... $ECHO_C" >&6 167- cat >conftest.$ac_ext <<_ACEOF 168- /* confdefs.h. */ 169- _ACEOF 170- cat confdefs.h >>conftest.$ac_ext 171- cat >>conftest.$ac_ext <<_ACEOF 172- /* end confdefs.h. */ 173- $ac_includes_default 174- #include <netinet/in.h> 175- _ACEOF 176- rm -f conftest.$ac_objext 177- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 178- (eval $ac_compile) 2>conftest.er1 179- ac_status=$? 180- grep -v '^ *+' conftest.er1 >conftest.err 181- rm -f conftest.er1 182- cat conftest.err >&5 183- echo "$as_me:$LINENO: \$? = $ac_status" >&5 184- (exit $ac_status); } && 185- { ac_try='test -z "$ac_c_werror_flag" 186- || test ! -s conftest.err' 187- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 188- (eval $ac_try) 2>&5 189- ac_status=$? 190- echo "$as_me:$LINENO: \$? = $ac_status" >&5 191- (exit $ac_status); }; } && 192- { ac_try='test -s conftest.$ac_objext' 193- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 194- (eval $ac_try) 2>&5 195- ac_status=$? 196- echo "$as_me:$LINENO: \$? = $ac_status" >&5 197- (exit $ac_status); }; }; then 198- ac_header_compiler=yes 199- else 200- echo "$as_me: failed program was:" >&5 201- sed 's/^/| /' conftest.$ac_ext >&5 202- 203- ac_header_compiler=no 204- fi 205- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 206- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 207- echo "${ECHO_T}$ac_header_compiler" >&6 208- 209- # Is the header present? 210- echo "$as_me:$LINENO: checking netinet/in.h presence" >&5 211- echo $ECHO_N "checking netinet/in.h presence... $ECHO_C" >&6 212- cat >conftest.$ac_ext <<_ACEOF 213- /* confdefs.h. */ 214- _ACEOF 215- cat confdefs.h >>conftest.$ac_ext 216- cat >>conftest.$ac_ext <<_ACEOF 217- /* end confdefs.h. */ 218- #include <netinet/in.h> 219- _ACEOF 220- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 221- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 222- ac_status=$? 223- grep -v '^ *+' conftest.er1 >conftest.err 224- rm -f conftest.er1 225- cat conftest.err >&5 226- echo "$as_me:$LINENO: \$? = $ac_status" >&5 227- (exit $ac_status); } >/dev/null; then 228- if test -s conftest.err; then 229- ac_cpp_err=$ac_c_preproc_warn_flag 230- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 231- else 232- ac_cpp_err= 233- fi 234- else 235- ac_cpp_err=yes 236- fi 237- if test -z "$ac_cpp_err"; then 238- ac_header_preproc=yes 239- else 240- echo "$as_me: failed program was:" >&5 241- sed 's/^/| /' conftest.$ac_ext >&5 242- 243- ac_header_preproc=no 244- fi 245- rm -f conftest.err conftest.$ac_ext 246- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 247- echo "${ECHO_T}$ac_header_preproc" >&6 248- 249- # So? What about this header? 250- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 251- yes:no: ) 252- { echo "$as_me:$LINENO: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&5 253- echo "$as_me: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&2;} 254- { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the compiler's result" >&5 255- echo "$as_me: WARNING: netinet/in.h: proceeding with the compiler's result" >&2;} 256- ac_header_preproc=yes 257- ;; 258- no:yes:* ) 259- { echo "$as_me:$LINENO: WARNING: netinet/in.h: present but cannot be compiled" >&5 260- echo "$as_me: WARNING: netinet/in.h: present but cannot be compiled" >&2;} 261- { echo "$as_me:$LINENO: WARNING: netinet/in.h: check for missing prerequisite headers?" >&5 262- echo "$as_me: WARNING: netinet/in.h: check for missing prerequisite headers?" >&2;} 263- { echo "$as_me:$LINENO: WARNING: netinet/in.h: see the Autoconf documentation" >&5 264- echo "$as_me: WARNING: netinet/in.h: see the Autoconf documentation" >&2;} 265- { echo "$as_me:$LINENO: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&5 266- echo "$as_me: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&2;} 267- { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&5 268- echo "$as_me: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&2;} 269- { echo "$as_me:$LINENO: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&5 270- echo "$as_me: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&2;} 271- ( 272- cat <<\_ASBOX 273- ## ------------------------------------------ ## 274- ## Report this to the AC_PACKAGE_NAME lists. ## 275- ## ------------------------------------------ ## 276- _ASBOX 277- ) | 278- sed "s/^/$as_me: WARNING: /" >&2 279- ;; 280- esac 281- echo "$as_me:$LINENO: checking for netinet/in.h" >&5 282- echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6 283- if test "${ac_cv_header_netinet_in_h+set}" = set; then 284- echo $ECHO_N "(cached) $ECHO_C" >&6 285- else 286- ac_cv_header_netinet_in_h=$ac_header_preproc 287- fi 288- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 289- echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6 290- 291- fi 292- if test $ac_cv_header_netinet_in_h = yes; then 293- : 294- else 295- { { echo "$as_me:$LINENO: error: \"*** no netinet/in.h\"" >&5 296- echo "$as_me: error: \"*** no netinet/in.h\"" >&2;} 297- { (exit 1); exit 1; }; } 298- fi 299- 300- 301- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then 302- echo "$as_me:$LINENO: checking for netinet/tcp.h" >&5 303- echo $ECHO_N "checking for netinet/tcp.h... $ECHO_C" >&6 304- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then 305- echo $ECHO_N "(cached) $ECHO_C" >&6 306- fi 307- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_tcp_h" >&5 308- echo "${ECHO_T}$ac_cv_header_netinet_tcp_h" >&6 309- else 310- # Is the header compilable? 311- echo "$as_me:$LINENO: checking netinet/tcp.h usability" >&5 312- echo $ECHO_N "checking netinet/tcp.h usability... $ECHO_C" >&6 313- cat >conftest.$ac_ext <<_ACEOF 314- /* confdefs.h. */ 315- _ACEOF 316- cat confdefs.h >>conftest.$ac_ext 317- cat >>conftest.$ac_ext <<_ACEOF 318- /* end confdefs.h. */ 319- $ac_includes_default 320- #include <netinet/tcp.h> 321- _ACEOF 322- rm -f conftest.$ac_objext 323- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 324- (eval $ac_compile) 2>conftest.er1 325- ac_status=$? 326- grep -v '^ *+' conftest.er1 >conftest.err 327- rm -f conftest.er1 328- cat conftest.err >&5 329- echo "$as_me:$LINENO: \$? = $ac_status" >&5 330- (exit $ac_status); } && 331- { ac_try='test -z "$ac_c_werror_flag" 332- || test ! -s conftest.err' 333- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 334- (eval $ac_try) 2>&5 335- ac_status=$? 336- echo "$as_me:$LINENO: \$? = $ac_status" >&5 337- (exit $ac_status); }; } && 338- { ac_try='test -s conftest.$ac_objext' 339- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 340- (eval $ac_try) 2>&5 341- ac_status=$? 342- echo "$as_me:$LINENO: \$? = $ac_status" >&5 343- (exit $ac_status); }; }; then 344- ac_header_compiler=yes 345- else 346- echo "$as_me: failed program was:" >&5 347- sed 's/^/| /' conftest.$ac_ext >&5 348- 349- ac_header_compiler=no 350- fi 351- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 352- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 353- echo "${ECHO_T}$ac_header_compiler" >&6 354- 355- # Is the header present? 356- echo "$as_me:$LINENO: checking netinet/tcp.h presence" >&5 357- echo $ECHO_N "checking netinet/tcp.h presence... $ECHO_C" >&6 358- cat >conftest.$ac_ext <<_ACEOF 359- /* confdefs.h. */ 360- _ACEOF 361- cat confdefs.h >>conftest.$ac_ext 362- cat >>conftest.$ac_ext <<_ACEOF 363- /* end confdefs.h. */ 364- #include <netinet/tcp.h> 365- _ACEOF 366- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 367- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 368- ac_status=$? 369- grep -v '^ *+' conftest.er1 >conftest.err 370- rm -f conftest.er1 371- cat conftest.err >&5 372- echo "$as_me:$LINENO: \$? = $ac_status" >&5 373- (exit $ac_status); } >/dev/null; then 374- if test -s conftest.err; then 375- ac_cpp_err=$ac_c_preproc_warn_flag 376- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 377- else 378- ac_cpp_err= 379- fi 380- else 381- ac_cpp_err=yes 382- fi 383- if test -z "$ac_cpp_err"; then 384- ac_header_preproc=yes 385- else 386- echo "$as_me: failed program was:" >&5 387- sed 's/^/| /' conftest.$ac_ext >&5 388- 389- ac_header_preproc=no 390- fi 391- rm -f conftest.err conftest.$ac_ext 392- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 393- echo "${ECHO_T}$ac_header_preproc" >&6 394- 395- # So? What about this header? 396- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 397- yes:no: ) 398- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: accepted by the compiler, rejected by the preprocessor!" >&5 399- echo "$as_me: WARNING: netinet/tcp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} 400- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: proceeding with the compiler's result" >&5 401- echo "$as_me: WARNING: netinet/tcp.h: proceeding with the compiler's result" >&2;} 402- ac_header_preproc=yes 403- ;; 404- no:yes:* ) 405- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: present but cannot be compiled" >&5 406- echo "$as_me: WARNING: netinet/tcp.h: present but cannot be compiled" >&2;} 407- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: check for missing prerequisite headers?" >&5 408- echo "$as_me: WARNING: netinet/tcp.h: check for missing prerequisite headers?" >&2;} 409- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: see the Autoconf documentation" >&5 410- echo "$as_me: WARNING: netinet/tcp.h: see the Autoconf documentation" >&2;} 411- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: section \"Present But Cannot Be Compiled\"" >&5 412- echo "$as_me: WARNING: netinet/tcp.h: section \"Present But Cannot Be Compiled\"" >&2;} 413- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: proceeding with the preprocessor's result" >&5 414- echo "$as_me: WARNING: netinet/tcp.h: proceeding with the preprocessor's result" >&2;} 415- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: in the future, the compiler will take precedence" >&5 416- echo "$as_me: WARNING: netinet/tcp.h: in the future, the compiler will take precedence" >&2;} 417- ( 418- cat <<\_ASBOX 419- ## ------------------------------------------ ## 420- ## Report this to the AC_PACKAGE_NAME lists. ## 421- ## ------------------------------------------ ## 422- _ASBOX 423- ) | 424- sed "s/^/$as_me: WARNING: /" >&2 425- ;; 426- esac 427- echo "$as_me:$LINENO: checking for netinet/tcp.h" >&5 428- echo $ECHO_N "checking for netinet/tcp.h... $ECHO_C" >&6 429- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then 430- echo $ECHO_N "(cached) $ECHO_C" >&6 431- else 432- ac_cv_header_netinet_tcp_h=$ac_header_preproc 433- fi 434- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_tcp_h" >&5 435- echo "${ECHO_T}$ac_cv_header_netinet_tcp_h" >&6 436- 437- fi 438- if test $ac_cv_header_netinet_tcp_h = yes; then 439- : 440- else 441- { { echo "$as_me:$LINENO: error: \"*** no netinet/tcp.h\"" >&5 442- echo "$as_me: error: \"*** no netinet/tcp.h\"" >&2;} 443- { (exit 1); exit 1; }; } 444- fi 445- 446- 447 if test "${ac_cv_header_sys_param_h+set}" = set; then 448 echo "$as_me:$LINENO: checking for sys/param.h" >&5 449 echo $ECHO_N "checking for sys/param.h... $ECHO_C" >&6 450--- 20719,20724 ---- 451*************** 452*** 21303,21454 **** 453 fi 454 455 456- if test "${ac_cv_header_sys_socket_h+set}" = set; then 457- echo "$as_me:$LINENO: checking for sys/socket.h" >&5 458- echo $ECHO_N "checking for sys/socket.h... $ECHO_C" >&6 459- if test "${ac_cv_header_sys_socket_h+set}" = set; then 460- echo $ECHO_N "(cached) $ECHO_C" >&6 461- fi 462- echo "$as_me:$LINENO: result: $ac_cv_header_sys_socket_h" >&5 463- echo "${ECHO_T}$ac_cv_header_sys_socket_h" >&6 464- else 465- # Is the header compilable? 466- echo "$as_me:$LINENO: checking sys/socket.h usability" >&5 467- echo $ECHO_N "checking sys/socket.h usability... $ECHO_C" >&6 468- cat >conftest.$ac_ext <<_ACEOF 469- /* confdefs.h. */ 470- _ACEOF 471- cat confdefs.h >>conftest.$ac_ext 472- cat >>conftest.$ac_ext <<_ACEOF 473- /* end confdefs.h. */ 474- $ac_includes_default 475- #include <sys/socket.h> 476- _ACEOF 477- rm -f conftest.$ac_objext 478- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 479- (eval $ac_compile) 2>conftest.er1 480- ac_status=$? 481- grep -v '^ *+' conftest.er1 >conftest.err 482- rm -f conftest.er1 483- cat conftest.err >&5 484- echo "$as_me:$LINENO: \$? = $ac_status" >&5 485- (exit $ac_status); } && 486- { ac_try='test -z "$ac_c_werror_flag" 487- || test ! -s conftest.err' 488- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 489- (eval $ac_try) 2>&5 490- ac_status=$? 491- echo "$as_me:$LINENO: \$? = $ac_status" >&5 492- (exit $ac_status); }; } && 493- { ac_try='test -s conftest.$ac_objext' 494- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 495- (eval $ac_try) 2>&5 496- ac_status=$? 497- echo "$as_me:$LINENO: \$? = $ac_status" >&5 498- (exit $ac_status); }; }; then 499- ac_header_compiler=yes 500- else 501- echo "$as_me: failed program was:" >&5 502- sed 's/^/| /' conftest.$ac_ext >&5 503- 504- ac_header_compiler=no 505- fi 506- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 507- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 508- echo "${ECHO_T}$ac_header_compiler" >&6 509- 510- # Is the header present? 511- echo "$as_me:$LINENO: checking sys/socket.h presence" >&5 512- echo $ECHO_N "checking sys/socket.h presence... $ECHO_C" >&6 513- cat >conftest.$ac_ext <<_ACEOF 514- /* confdefs.h. */ 515- _ACEOF 516- cat confdefs.h >>conftest.$ac_ext 517- cat >>conftest.$ac_ext <<_ACEOF 518- /* end confdefs.h. */ 519- #include <sys/socket.h> 520- _ACEOF 521- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 522- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 523- ac_status=$? 524- grep -v '^ *+' conftest.er1 >conftest.err 525- rm -f conftest.er1 526- cat conftest.err >&5 527- echo "$as_me:$LINENO: \$? = $ac_status" >&5 528- (exit $ac_status); } >/dev/null; then 529- if test -s conftest.err; then 530- ac_cpp_err=$ac_c_preproc_warn_flag 531- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 532- else 533- ac_cpp_err= 534- fi 535- else 536- ac_cpp_err=yes 537- fi 538- if test -z "$ac_cpp_err"; then 539- ac_header_preproc=yes 540- else 541- echo "$as_me: failed program was:" >&5 542- sed 's/^/| /' conftest.$ac_ext >&5 543- 544- ac_header_preproc=no 545- fi 546- rm -f conftest.err conftest.$ac_ext 547- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 548- echo "${ECHO_T}$ac_header_preproc" >&6 549- 550- # So? What about this header? 551- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 552- yes:no: ) 553- { echo "$as_me:$LINENO: WARNING: sys/socket.h: accepted by the compiler, rejected by the preprocessor!" >&5 554- echo "$as_me: WARNING: sys/socket.h: accepted by the compiler, rejected by the preprocessor!" >&2;} 555- { echo "$as_me:$LINENO: WARNING: sys/socket.h: proceeding with the compiler's result" >&5 556- echo "$as_me: WARNING: sys/socket.h: proceeding with the compiler's result" >&2;} 557- ac_header_preproc=yes 558- ;; 559- no:yes:* ) 560- { echo "$as_me:$LINENO: WARNING: sys/socket.h: present but cannot be compiled" >&5 561- echo "$as_me: WARNING: sys/socket.h: present but cannot be compiled" >&2;} 562- { echo "$as_me:$LINENO: WARNING: sys/socket.h: check for missing prerequisite headers?" >&5 563- echo "$as_me: WARNING: sys/socket.h: check for missing prerequisite headers?" >&2;} 564- { echo "$as_me:$LINENO: WARNING: sys/socket.h: see the Autoconf documentation" >&5 565- echo "$as_me: WARNING: sys/socket.h: see the Autoconf documentation" >&2;} 566- { echo "$as_me:$LINENO: WARNING: sys/socket.h: section \"Present But Cannot Be Compiled\"" >&5 567- echo "$as_me: WARNING: sys/socket.h: section \"Present But Cannot Be Compiled\"" >&2;} 568- { echo "$as_me:$LINENO: WARNING: sys/socket.h: proceeding with the preprocessor's result" >&5 569- echo "$as_me: WARNING: sys/socket.h: proceeding with the preprocessor's result" >&2;} 570- { echo "$as_me:$LINENO: WARNING: sys/socket.h: in the future, the compiler will take precedence" >&5 571- echo "$as_me: WARNING: sys/socket.h: in the future, the compiler will take precedence" >&2;} 572- ( 573- cat <<\_ASBOX 574- ## ------------------------------------------ ## 575- ## Report this to the AC_PACKAGE_NAME lists. ## 576- ## ------------------------------------------ ## 577- _ASBOX 578- ) | 579- sed "s/^/$as_me: WARNING: /" >&2 580- ;; 581- esac 582- echo "$as_me:$LINENO: checking for sys/socket.h" >&5 583- echo $ECHO_N "checking for sys/socket.h... $ECHO_C" >&6 584- if test "${ac_cv_header_sys_socket_h+set}" = set; then 585- echo $ECHO_N "(cached) $ECHO_C" >&6 586- else 587- ac_cv_header_sys_socket_h=$ac_header_preproc 588- fi 589- echo "$as_me:$LINENO: result: $ac_cv_header_sys_socket_h" >&5 590- echo "${ECHO_T}$ac_cv_header_sys_socket_h" >&6 591- 592- fi 593- if test $ac_cv_header_sys_socket_h = yes; then 594- : 595- else 596- { { echo "$as_me:$LINENO: error: \"*** no sys/socket.h\"" >&5 597- echo "$as_me: error: \"*** no sys/socket.h\"" >&2;} 598- { (exit 1); exit 1; }; } 599- fi 600- 601- 602 if test "${ac_cv_header_sys_time_h+set}" = set; then 603 echo "$as_me:$LINENO: checking for sys/time.h" >&5 604 echo $ECHO_N "checking for sys/time.h... $ECHO_C" >&6 605--- 20865,20870 ---- 606*************** 607*** 21595,21746 **** 608 fi 609 610 611- if test "${ac_cv_header_sys_un_h+set}" = set; then 612- echo "$as_me:$LINENO: checking for sys/un.h" >&5 613- echo $ECHO_N "checking for sys/un.h... $ECHO_C" >&6 614- if test "${ac_cv_header_sys_un_h+set}" = set; then 615- echo $ECHO_N "(cached) $ECHO_C" >&6 616- fi 617- echo "$as_me:$LINENO: result: $ac_cv_header_sys_un_h" >&5 618- echo "${ECHO_T}$ac_cv_header_sys_un_h" >&6 619- else 620- # Is the header compilable? 621- echo "$as_me:$LINENO: checking sys/un.h usability" >&5 622- echo $ECHO_N "checking sys/un.h usability... $ECHO_C" >&6 623- cat >conftest.$ac_ext <<_ACEOF 624- /* confdefs.h. */ 625- _ACEOF 626- cat confdefs.h >>conftest.$ac_ext 627- cat >>conftest.$ac_ext <<_ACEOF 628- /* end confdefs.h. */ 629- $ac_includes_default 630- #include <sys/un.h> 631- _ACEOF 632- rm -f conftest.$ac_objext 633- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 634- (eval $ac_compile) 2>conftest.er1 635- ac_status=$? 636- grep -v '^ *+' conftest.er1 >conftest.err 637- rm -f conftest.er1 638- cat conftest.err >&5 639- echo "$as_me:$LINENO: \$? = $ac_status" >&5 640- (exit $ac_status); } && 641- { ac_try='test -z "$ac_c_werror_flag" 642- || test ! -s conftest.err' 643- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 644- (eval $ac_try) 2>&5 645- ac_status=$? 646- echo "$as_me:$LINENO: \$? = $ac_status" >&5 647- (exit $ac_status); }; } && 648- { ac_try='test -s conftest.$ac_objext' 649- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 650- (eval $ac_try) 2>&5 651- ac_status=$? 652- echo "$as_me:$LINENO: \$? = $ac_status" >&5 653- (exit $ac_status); }; }; then 654- ac_header_compiler=yes 655- else 656- echo "$as_me: failed program was:" >&5 657- sed 's/^/| /' conftest.$ac_ext >&5 658- 659- ac_header_compiler=no 660- fi 661- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 662- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 663- echo "${ECHO_T}$ac_header_compiler" >&6 664- 665- # Is the header present? 666- echo "$as_me:$LINENO: checking sys/un.h presence" >&5 667- echo $ECHO_N "checking sys/un.h presence... $ECHO_C" >&6 668- cat >conftest.$ac_ext <<_ACEOF 669- /* confdefs.h. */ 670- _ACEOF 671- cat confdefs.h >>conftest.$ac_ext 672- cat >>conftest.$ac_ext <<_ACEOF 673- /* end confdefs.h. */ 674- #include <sys/un.h> 675- _ACEOF 676- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 677- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 678- ac_status=$? 679- grep -v '^ *+' conftest.er1 >conftest.err 680- rm -f conftest.er1 681- cat conftest.err >&5 682- echo "$as_me:$LINENO: \$? = $ac_status" >&5 683- (exit $ac_status); } >/dev/null; then 684- if test -s conftest.err; then 685- ac_cpp_err=$ac_c_preproc_warn_flag 686- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 687- else 688- ac_cpp_err= 689- fi 690- else 691- ac_cpp_err=yes 692- fi 693- if test -z "$ac_cpp_err"; then 694- ac_header_preproc=yes 695- else 696- echo "$as_me: failed program was:" >&5 697- sed 's/^/| /' conftest.$ac_ext >&5 698- 699- ac_header_preproc=no 700- fi 701- rm -f conftest.err conftest.$ac_ext 702- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 703- echo "${ECHO_T}$ac_header_preproc" >&6 704- 705- # So? What about this header? 706- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 707- yes:no: ) 708- { echo "$as_me:$LINENO: WARNING: sys/un.h: accepted by the compiler, rejected by the preprocessor!" >&5 709- echo "$as_me: WARNING: sys/un.h: accepted by the compiler, rejected by the preprocessor!" >&2;} 710- { echo "$as_me:$LINENO: WARNING: sys/un.h: proceeding with the compiler's result" >&5 711- echo "$as_me: WARNING: sys/un.h: proceeding with the compiler's result" >&2;} 712- ac_header_preproc=yes 713- ;; 714- no:yes:* ) 715- { echo "$as_me:$LINENO: WARNING: sys/un.h: present but cannot be compiled" >&5 716- echo "$as_me: WARNING: sys/un.h: present but cannot be compiled" >&2;} 717- { echo "$as_me:$LINENO: WARNING: sys/un.h: check for missing prerequisite headers?" >&5 718- echo "$as_me: WARNING: sys/un.h: check for missing prerequisite headers?" >&2;} 719- { echo "$as_me:$LINENO: WARNING: sys/un.h: see the Autoconf documentation" >&5 720- echo "$as_me: WARNING: sys/un.h: see the Autoconf documentation" >&2;} 721- { echo "$as_me:$LINENO: WARNING: sys/un.h: section \"Present But Cannot Be Compiled\"" >&5 722- echo "$as_me: WARNING: sys/un.h: section \"Present But Cannot Be Compiled\"" >&2;} 723- { echo "$as_me:$LINENO: WARNING: sys/un.h: proceeding with the preprocessor's result" >&5 724- echo "$as_me: WARNING: sys/un.h: proceeding with the preprocessor's result" >&2;} 725- { echo "$as_me:$LINENO: WARNING: sys/un.h: in the future, the compiler will take precedence" >&5 726- echo "$as_me: WARNING: sys/un.h: in the future, the compiler will take precedence" >&2;} 727- ( 728- cat <<\_ASBOX 729- ## ------------------------------------------ ## 730- ## Report this to the AC_PACKAGE_NAME lists. ## 731- ## ------------------------------------------ ## 732- _ASBOX 733- ) | 734- sed "s/^/$as_me: WARNING: /" >&2 735- ;; 736- esac 737- echo "$as_me:$LINENO: checking for sys/un.h" >&5 738- echo $ECHO_N "checking for sys/un.h... $ECHO_C" >&6 739- if test "${ac_cv_header_sys_un_h+set}" = set; then 740- echo $ECHO_N "(cached) $ECHO_C" >&6 741- else 742- ac_cv_header_sys_un_h=$ac_header_preproc 743- fi 744- echo "$as_me:$LINENO: result: $ac_cv_header_sys_un_h" >&5 745- echo "${ECHO_T}$ac_cv_header_sys_un_h" >&6 746- 747- fi 748- if test $ac_cv_header_sys_un_h = yes; then 749- : 750- else 751- { { echo "$as_me:$LINENO: error: \"*** no sys/un.h\"" >&5 752- echo "$as_me: error: \"*** no sys/un.h\"" >&2;} 753- { (exit 1); exit 1; }; } 754- fi 755- 756- 757 if test "${ac_cv_header_unistd_h+set}" = set; then 758 echo "$as_me:$LINENO: checking for unistd.h" >&5 759 echo $ECHO_N "checking for unistd.h... $ECHO_C" >&6 760--- 21011,21016 ---- 761diff -rc toolbuslib-1.1/src/atb-tool.c toolbuslib-1.1-new/src/atb-tool.c 762*** toolbuslib-1.1/src/atb-tool.c 2008-11-10 13:59:41.000000000 +0100 763--- toolbuslib-1.1-new/src/atb-tool.c 2010-08-23 16:58:11.000000000 +0200 764*************** 765*** 6,22 **** 766 #include <stdlib.h> 767 #include <unistd.h> 768 #include <errno.h> 769- #include <netdb.h> 770- #include <sys/socket.h> 771 #include <sys/time.h> 772- #include <sys/un.h> 773 #include <sys/param.h> 774- #include <netinet/in.h> 775- #include <netinet/tcp.h> 776 #include <signal.h> 777 #include <string.h> 778! 779! #include <sys/resource.h> 780 781 #include <aterm2.h> 782 #include "safio.h" 783--- 6,16 ---- 784 #include <stdlib.h> 785 #include <unistd.h> 786 #include <errno.h> 787 #include <sys/time.h> 788 #include <sys/param.h> 789 #include <signal.h> 790 #include <string.h> 791! #include <winsock2.h> 792 793 #include <aterm2.h> 794 #include "safio.h" 795*************** 796*** 39,44 **** 797--- 33,40 ---- 798 #define MAX_NR_QUEUES 64 799 #define MAX_QUEUE_LEN 128 800 801+ #define MAXHOSTNAMELEN 256 802+ 803 /* Operation codes. */ 804 /* From Tool to ToolBus. */ 805 #define CONNECT 1 806*************** 807*** 144,151 **** 808 * Gathers performance stats. 809 */ 810 static ATerm getPerformanceStats(){ 811- struct rusage resourceUsage; 812- 813 // Type stuff 814 ATerm remote = (ATerm) ATmakeAppl0(ATmakeAFun("remote", 0, ATtrue)); 815 ATerm toolType = (ATerm) ATmakeAppl1(ATmakeAFun("type", 1, ATfalse), remote); 816--- 140,145 ---- 817*************** 818*** 161,171 **** 819 // Thread stuff 820 ATerm threads; 821 822- getrusage(RUSAGE_SELF, &resourceUsage); 823- 824 { 825! int userTime = (int) (resourceUsage.ru_utime.tv_sec * 1000) + (resourceUsage.ru_utime.tv_usec / 1000); 826! int systemTime = (int) (resourceUsage.ru_stime.tv_sec * 1000) + (resourceUsage.ru_stime.tv_usec / 1000); 827 828 ATerm userTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("user-time", 1, ATfalse), (ATerm) ATmakeInt(userTime)); 829 ATerm systemTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("system-time", 1, ATfalse), (ATerm) ATmakeInt(systemTime)); 830--- 155,163 ---- 831 // Thread stuff 832 ATerm threads; 833 834 { 835! int userTime = 0; 836! int systemTime = 0; 837 838 ATerm userTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("user-time", 1, ATfalse), (ATerm) ATmakeInt(userTime)); 839 ATerm systemTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("system-time", 1, ATfalse), (ATerm) ATmakeInt(systemTime)); 840*************** 841*** 349,364 **** 842 843 otp = (OperationTermPair) malloc(sizeof(struct _OperationTermPair)); 844 845- /* Initialize handlers for OS signals */ 846- { 847- struct sigaction disconnect; 848- disconnect.sa_handler = disconnectHandler; 849- sigemptyset(&disconnect.sa_mask); 850- 851- sigaction(SIGTERM, &disconnect, NULL); 852- sigaction(SIGQUIT, &disconnect, NULL); 853- } 854- 855 /* Get hostname of machine that runs this particular tool */ 856 return gethostname(this_host, MAXHOSTNAMELEN); 857 } 858--- 341,346 ---- 859diff -rc toolbuslib-1.1/src/Makefile.in toolbuslib-1.1-new/src/Makefile.in 860*** toolbuslib-1.1/src/Makefile.in 2008-11-10 13:59:47.000000000 +0100 861--- toolbuslib-1.1-new/src/Makefile.in 2010-08-24 10:28:10.000000000 +0200 862*************** 863*** 223,234 **** 864 libATB_la_SOURCES = atb-tool.c 865 libATB_la_CPPFLAGS = $(ATERM_CFLAGS) 866 libATB_la_LDFLAGS = -avoid-version -no-undefined $(AM_LDFLAGS) 867! libATB_la_LIBADD = $(ATERM_LIBS) $(SOCKETLIBS) 868 869 bin_PROGRAMS = tbunpack 870 871 tbunpack_SOURCES = tbunpack.c atb-tool.c 872! tbunpack_LDADD = $(ATERM_LIBS) 873 subdir = ./src 874 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 875 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs 876--- 223,234 ---- 877 libATB_la_SOURCES = atb-tool.c 878 libATB_la_CPPFLAGS = $(ATERM_CFLAGS) 879 libATB_la_LDFLAGS = -avoid-version -no-undefined $(AM_LDFLAGS) 880! libATB_la_LIBADD = $(ATERM_LIBS) $(SOCKETLIBS) -lwsock32 881 882 bin_PROGRAMS = tbunpack 883 884 tbunpack_SOURCES = tbunpack.c atb-tool.c 885! tbunpack_LDADD = $(ATERM_LIBS) -lwsock32 886 subdir = ./src 887 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 888 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs