Changeset 5261
- Timestamp:
- Mar 15, 2016 3:57:39 AM (9 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 16 added
- 5 deleted
- 84 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c
r5219 r5261 48 48 #else 49 49 # include <srtp.h> 50 # include <crypto_kernel.h> 50 51 #endif 51 52 … … 88 89 /* plain RTP/RTCP (no cipher & no auth) */ 89 90 {"NULL", NULL_CIPHER, 0, NULL_AUTH, 0, 0, 0, sec_serv_none}, 91 92 /* cipher AES_CM_256, auth HMAC_SHA1, auth tag len = 10 octets */ 93 {"AES_CM_256_HMAC_SHA1_80", AES_ICM, 46, HMAC_SHA1, 20, 10, 10, 94 sec_serv_conf_and_auth}, 95 96 /* cipher AES_CM_256, auth HMAC_SHA1, auth tag len = 10 octets */ 97 {"AES_CM_256_HMAC_SHA1_32", AES_ICM, 46, HMAC_SHA1, 20, 4, 10, 98 sec_serv_conf_and_auth}, 99 100 /* cipher AES_CM_192, auth HMAC_SHA1, auth tag len = 10 octets */ 101 //{"AES_CM_192_HMAC_SHA1_80", AES_ICM, 38, HMAC_SHA1, 20, 10, 10, 102 //sec_serv_conf_and_auth}, 103 104 /* cipher AES_CM_192, auth HMAC_SHA1, auth tag len = 4 octets */ 105 //{"AES_CM_192_HMAC_SHA1_80", AES_ICM, 38, HMAC_SHA1, 20, 4, 10, 106 //sec_serv_conf_and_auth}, 90 107 91 108 /* cipher AES_CM, auth HMAC_SHA1, auth tag len = 10 octets */ … … 337 354 PJ_UNUSED_ARG(endpt); 338 355 339 #if defined(PJMEDIA_EXTERNAL_SRTP) && (PJMEDIA_EXTERNAL_SRTP != 0) 356 #if !defined(PJMEDIA_SRTP_HAS_DEINIT) && !defined(PJMEDIA_SRTP_HAS_SHUTDOWN) 357 # define PJMEDIA_SRTP_HAS_SHUTDOWN 1 358 #endif 340 359 341 360 # if defined(PJMEDIA_SRTP_HAS_DEINIT) && PJMEDIA_SRTP_HAS_DEINIT!=0 … … 346 365 err = err_status_ok; 347 366 # endif 348 349 #else350 err = srtp_deinit();351 #endif352 367 if (err != err_status_ok) { 353 368 PJ_LOG(4, (THIS_FILE, "Failed to deinitialize libsrtp: %s", … … 1170 1185 pj_str_t input; 1171 1186 char *token; 1172 pj_size_t token_len;1173 1187 pj_str_t tmp; 1174 1188 pj_status_t status; 1175 int itmp ;1189 int itmp, token_len; 1176 1190 1177 1191 pj_bzero(crypto, sizeof(*crypto)); -
pjproject/trunk/third_party/build/srtp/Makefile
r4786 r5261 49 49 crypto/kernel/key.o $(rng) $(err) # $(ust) 50 50 51 srtpobj = srtp/srtp.o 51 srtpobj = srtp/srtp.o srtp/ekt.o 52 52 53 53 cryptobj = $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(replay) -
pjproject/trunk/third_party/build/srtp/libsrtp.vcproj
r4537 r5261 13 13 /> 14 14 <Platform 15 Name="x64" 16 /> 17 <Platform 15 18 Name="Pocket PC 2003 (ARMV4)" 16 19 /> 17 20 <Platform 18 21 Name="Smartphone 2003 (ARMV4)" 19 />20 <Platform21 Name="x64"22 22 /> 23 23 <Platform … … 62 62 Name="VCCLCompilerTool" 63 63 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include" 64 PreprocessorDefinitions="_LIB; "64 PreprocessorDefinitions="_LIB;HAVE_CONFIG_H" 65 65 PrecompiledHeaderFile="" 66 66 /> … … 95 95 </Configuration> 96 96 <Configuration 97 Name="Debug|x64" 98 ConfigurationType="4" 99 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops" 100 ATLMinimizesCRunTimeLibraryUsage="false" 101 CharacterSet="2" 102 > 103 <Tool 104 Name="VCPreBuildEventTool" 105 /> 106 <Tool 107 Name="VCCustomBuildTool" 108 /> 109 <Tool 110 Name="VCXMLDataGeneratorTool" 111 /> 112 <Tool 113 Name="VCWebServiceProxyGeneratorTool" 114 /> 115 <Tool 116 Name="VCMIDLTool" 117 TargetEnvironment="3" 118 /> 119 <Tool 120 Name="VCCLCompilerTool" 121 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include" 122 PreprocessorDefinitions="_LIB;HAVE_CONFIG_H" 123 PrecompiledHeaderFile="" 124 DebugInformationFormat="3" 125 /> 126 <Tool 127 Name="VCManagedResourceCompilerTool" 128 /> 129 <Tool 130 Name="VCResourceCompilerTool" 131 /> 132 <Tool 133 Name="VCPreLinkEventTool" 134 /> 135 <Tool 136 Name="VCLibrarianTool" 137 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" 138 /> 139 <Tool 140 Name="VCALinkTool" 141 /> 142 <Tool 143 Name="VCXDCMakeTool" 144 /> 145 <Tool 146 Name="VCBscMakeTool" 147 /> 148 <Tool 149 Name="VCFxCopTool" 150 /> 151 <Tool 152 Name="VCPostBuildEventTool" 153 /> 154 </Configuration> 155 <Configuration 156 Name="Release|Win32" 157 ConfigurationType="4" 158 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" 159 ATLMinimizesCRunTimeLibraryUsage="false" 160 CharacterSet="2" 161 > 162 <Tool 163 Name="VCPreBuildEventTool" 164 /> 165 <Tool 166 Name="VCCustomBuildTool" 167 /> 168 <Tool 169 Name="VCXMLDataGeneratorTool" 170 /> 171 <Tool 172 Name="VCWebServiceProxyGeneratorTool" 173 /> 174 <Tool 175 Name="VCMIDLTool" 176 /> 177 <Tool 178 Name="VCCLCompilerTool" 179 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include" 180 PreprocessorDefinitions="_LIB;HAVE_CONFIG_H" 181 PrecompiledHeaderFile="" 182 /> 183 <Tool 184 Name="VCManagedResourceCompilerTool" 185 /> 186 <Tool 187 Name="VCResourceCompilerTool" 188 /> 189 <Tool 190 Name="VCPreLinkEventTool" 191 /> 192 <Tool 193 Name="VCLibrarianTool" 194 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" 195 /> 196 <Tool 197 Name="VCALinkTool" 198 /> 199 <Tool 200 Name="VCXDCMakeTool" 201 /> 202 <Tool 203 Name="VCBscMakeTool" 204 /> 205 <Tool 206 Name="VCFxCopTool" 207 /> 208 <Tool 209 Name="VCPostBuildEventTool" 210 /> 211 </Configuration> 212 <Configuration 213 Name="Release|x64" 214 ConfigurationType="4" 215 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops" 216 ATLMinimizesCRunTimeLibraryUsage="false" 217 CharacterSet="2" 218 > 219 <Tool 220 Name="VCPreBuildEventTool" 221 /> 222 <Tool 223 Name="VCCustomBuildTool" 224 /> 225 <Tool 226 Name="VCXMLDataGeneratorTool" 227 /> 228 <Tool 229 Name="VCWebServiceProxyGeneratorTool" 230 /> 231 <Tool 232 Name="VCMIDLTool" 233 TargetEnvironment="3" 234 /> 235 <Tool 236 Name="VCCLCompilerTool" 237 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include" 238 PreprocessorDefinitions="_LIB;HAVE_CONFIG_H" 239 PrecompiledHeaderFile="" 240 /> 241 <Tool 242 Name="VCManagedResourceCompilerTool" 243 /> 244 <Tool 245 Name="VCResourceCompilerTool" 246 /> 247 <Tool 248 Name="VCPreLinkEventTool" 249 /> 250 <Tool 251 Name="VCLibrarianTool" 252 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" 253 /> 254 <Tool 255 Name="VCALinkTool" 256 /> 257 <Tool 258 Name="VCXDCMakeTool" 259 /> 260 <Tool 261 Name="VCBscMakeTool" 262 /> 263 <Tool 264 Name="VCFxCopTool" 265 /> 266 <Tool 267 Name="VCPostBuildEventTool" 268 /> 269 </Configuration> 270 <Configuration 271 Name="Debug-Static|Win32" 272 ConfigurationType="4" 273 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops" 274 ATLMinimizesCRunTimeLibraryUsage="false" 275 CharacterSet="2" 276 > 277 <Tool 278 Name="VCPreBuildEventTool" 279 /> 280 <Tool 281 Name="VCCustomBuildTool" 282 /> 283 <Tool 284 Name="VCXMLDataGeneratorTool" 285 /> 286 <Tool 287 Name="VCWebServiceProxyGeneratorTool" 288 /> 289 <Tool 290 Name="VCMIDLTool" 291 /> 292 <Tool 293 Name="VCCLCompilerTool" 294 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include" 295 PreprocessorDefinitions="_LIB;HAVE_CONFIG_H" 296 PrecompiledHeaderFile="" 297 /> 298 <Tool 299 Name="VCManagedResourceCompilerTool" 300 /> 301 <Tool 302 Name="VCResourceCompilerTool" 303 /> 304 <Tool 305 Name="VCPreLinkEventTool" 306 /> 307 <Tool 308 Name="VCLibrarianTool" 309 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" 310 /> 311 <Tool 312 Name="VCALinkTool" 313 /> 314 <Tool 315 Name="VCXDCMakeTool" 316 /> 317 <Tool 318 Name="VCBscMakeTool" 319 /> 320 <Tool 321 Name="VCFxCopTool" 322 /> 323 <Tool 324 Name="VCPostBuildEventTool" 325 /> 326 </Configuration> 327 <Configuration 328 Name="Debug-Static|x64" 329 ConfigurationType="4" 330 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops" 331 ATLMinimizesCRunTimeLibraryUsage="false" 332 CharacterSet="2" 333 > 334 <Tool 335 Name="VCPreBuildEventTool" 336 /> 337 <Tool 338 Name="VCCustomBuildTool" 339 /> 340 <Tool 341 Name="VCXMLDataGeneratorTool" 342 /> 343 <Tool 344 Name="VCWebServiceProxyGeneratorTool" 345 /> 346 <Tool 347 Name="VCMIDLTool" 348 TargetEnvironment="3" 349 /> 350 <Tool 351 Name="VCCLCompilerTool" 352 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include" 353 PreprocessorDefinitions="_LIB;HAVE_CONFIG_H" 354 PrecompiledHeaderFile="" 355 DebugInformationFormat="3" 356 /> 357 <Tool 358 Name="VCManagedResourceCompilerTool" 359 /> 360 <Tool 361 Name="VCResourceCompilerTool" 362 /> 363 <Tool 364 Name="VCPreLinkEventTool" 365 /> 366 <Tool 367 Name="VCLibrarianTool" 368 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" 369 /> 370 <Tool 371 Name="VCALinkTool" 372 /> 373 <Tool 374 Name="VCXDCMakeTool" 375 /> 376 <Tool 377 Name="VCBscMakeTool" 378 /> 379 <Tool 380 Name="VCFxCopTool" 381 /> 382 <Tool 383 Name="VCPostBuildEventTool" 384 /> 385 </Configuration> 386 <Configuration 387 Name="Release-Dynamic|Win32" 388 ConfigurationType="4" 389 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" 390 ATLMinimizesCRunTimeLibraryUsage="false" 391 CharacterSet="2" 392 > 393 <Tool 394 Name="VCPreBuildEventTool" 395 /> 396 <Tool 397 Name="VCCustomBuildTool" 398 /> 399 <Tool 400 Name="VCXMLDataGeneratorTool" 401 /> 402 <Tool 403 Name="VCWebServiceProxyGeneratorTool" 404 /> 405 <Tool 406 Name="VCMIDLTool" 407 /> 408 <Tool 409 Name="VCCLCompilerTool" 410 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include" 411 PreprocessorDefinitions="_LIB;HAVE_CONFIG_H" 412 PrecompiledHeaderFile="" 413 /> 414 <Tool 415 Name="VCManagedResourceCompilerTool" 416 /> 417 <Tool 418 Name="VCResourceCompilerTool" 419 /> 420 <Tool 421 Name="VCPreLinkEventTool" 422 /> 423 <Tool 424 Name="VCLibrarianTool" 425 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" 426 /> 427 <Tool 428 Name="VCALinkTool" 429 /> 430 <Tool 431 Name="VCXDCMakeTool" 432 /> 433 <Tool 434 Name="VCBscMakeTool" 435 /> 436 <Tool 437 Name="VCFxCopTool" 438 /> 439 <Tool 440 Name="VCPostBuildEventTool" 441 /> 442 </Configuration> 443 <Configuration 444 Name="Release-Dynamic|x64" 445 ConfigurationType="4" 446 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops" 447 ATLMinimizesCRunTimeLibraryUsage="false" 448 CharacterSet="2" 449 > 450 <Tool 451 Name="VCPreBuildEventTool" 452 /> 453 <Tool 454 Name="VCCustomBuildTool" 455 /> 456 <Tool 457 Name="VCXMLDataGeneratorTool" 458 /> 459 <Tool 460 Name="VCWebServiceProxyGeneratorTool" 461 /> 462 <Tool 463 Name="VCMIDLTool" 464 TargetEnvironment="3" 465 /> 466 <Tool 467 Name="VCCLCompilerTool" 468 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include" 469 PreprocessorDefinitions="_LIB;HAVE_CONFIG_H" 470 PrecompiledHeaderFile="" 471 /> 472 <Tool 473 Name="VCManagedResourceCompilerTool" 474 /> 475 <Tool 476 Name="VCResourceCompilerTool" 477 /> 478 <Tool 479 Name="VCPreLinkEventTool" 480 /> 481 <Tool 482 Name="VCLibrarianTool" 483 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" 484 /> 485 <Tool 486 Name="VCALinkTool" 487 /> 488 <Tool 489 Name="VCXDCMakeTool" 490 /> 491 <Tool 492 Name="VCBscMakeTool" 493 /> 494 <Tool 495 Name="VCFxCopTool" 496 /> 497 <Tool 498 Name="VCPostBuildEventTool" 499 /> 500 </Configuration> 501 <Configuration 502 Name="Debug-Dynamic|Win32" 503 ConfigurationType="4" 504 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops" 505 ATLMinimizesCRunTimeLibraryUsage="false" 506 CharacterSet="2" 507 > 508 <Tool 509 Name="VCPreBuildEventTool" 510 /> 511 <Tool 512 Name="VCCustomBuildTool" 513 /> 514 <Tool 515 Name="VCXMLDataGeneratorTool" 516 /> 517 <Tool 518 Name="VCWebServiceProxyGeneratorTool" 519 /> 520 <Tool 521 Name="VCMIDLTool" 522 /> 523 <Tool 524 Name="VCCLCompilerTool" 525 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include" 526 PreprocessorDefinitions="_LIB;HAVE_CONFIG_H" 527 PrecompiledHeaderFile="" 528 /> 529 <Tool 530 Name="VCManagedResourceCompilerTool" 531 /> 532 <Tool 533 Name="VCResourceCompilerTool" 534 /> 535 <Tool 536 Name="VCPreLinkEventTool" 537 /> 538 <Tool 539 Name="VCLibrarianTool" 540 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" 541 /> 542 <Tool 543 Name="VCALinkTool" 544 /> 545 <Tool 546 Name="VCXDCMakeTool" 547 /> 548 <Tool 549 Name="VCBscMakeTool" 550 /> 551 <Tool 552 Name="VCFxCopTool" 553 /> 554 <Tool 555 Name="VCPostBuildEventTool" 556 /> 557 </Configuration> 558 <Configuration 559 Name="Debug-Dynamic|x64" 560 ConfigurationType="4" 561 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops" 562 ATLMinimizesCRunTimeLibraryUsage="false" 563 CharacterSet="2" 564 > 565 <Tool 566 Name="VCPreBuildEventTool" 567 /> 568 <Tool 569 Name="VCCustomBuildTool" 570 /> 571 <Tool 572 Name="VCXMLDataGeneratorTool" 573 /> 574 <Tool 575 Name="VCWebServiceProxyGeneratorTool" 576 /> 577 <Tool 578 Name="VCMIDLTool" 579 TargetEnvironment="3" 580 /> 581 <Tool 582 Name="VCCLCompilerTool" 583 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include" 584 PreprocessorDefinitions="_LIB;HAVE_CONFIG_H" 585 PrecompiledHeaderFile="" 586 DebugInformationFormat="3" 587 /> 588 <Tool 589 Name="VCManagedResourceCompilerTool" 590 /> 591 <Tool 592 Name="VCResourceCompilerTool" 593 /> 594 <Tool 595 Name="VCPreLinkEventTool" 596 /> 597 <Tool 598 Name="VCLibrarianTool" 599 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" 600 /> 601 <Tool 602 Name="VCALinkTool" 603 /> 604 <Tool 605 Name="VCXDCMakeTool" 606 /> 607 <Tool 608 Name="VCBscMakeTool" 609 /> 610 <Tool 611 Name="VCFxCopTool" 612 /> 613 <Tool 614 Name="VCPostBuildEventTool" 615 /> 616 </Configuration> 617 <Configuration 618 Name="Release-Static|Win32" 619 ConfigurationType="4" 620 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" 621 ATLMinimizesCRunTimeLibraryUsage="false" 622 CharacterSet="2" 623 > 624 <Tool 625 Name="VCPreBuildEventTool" 626 /> 627 <Tool 628 Name="VCCustomBuildTool" 629 /> 630 <Tool 631 Name="VCXMLDataGeneratorTool" 632 /> 633 <Tool 634 Name="VCWebServiceProxyGeneratorTool" 635 /> 636 <Tool 637 Name="VCMIDLTool" 638 /> 639 <Tool 640 Name="VCCLCompilerTool" 641 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include" 642 PreprocessorDefinitions="_LIB;HAVE_CONFIG_H" 643 PrecompiledHeaderFile="" 644 /> 645 <Tool 646 Name="VCManagedResourceCompilerTool" 647 /> 648 <Tool 649 Name="VCResourceCompilerTool" 650 /> 651 <Tool 652 Name="VCPreLinkEventTool" 653 /> 654 <Tool 655 Name="VCLibrarianTool" 656 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" 657 /> 658 <Tool 659 Name="VCALinkTool" 660 /> 661 <Tool 662 Name="VCXDCMakeTool" 663 /> 664 <Tool 665 Name="VCBscMakeTool" 666 /> 667 <Tool 668 Name="VCFxCopTool" 669 /> 670 <Tool 671 Name="VCPostBuildEventTool" 672 /> 673 </Configuration> 674 <Configuration 675 Name="Release-Static|x64" 676 ConfigurationType="4" 677 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops" 678 ATLMinimizesCRunTimeLibraryUsage="false" 679 CharacterSet="2" 680 > 681 <Tool 682 Name="VCPreBuildEventTool" 683 /> 684 <Tool 685 Name="VCCustomBuildTool" 686 /> 687 <Tool 688 Name="VCXMLDataGeneratorTool" 689 /> 690 <Tool 691 Name="VCWebServiceProxyGeneratorTool" 692 /> 693 <Tool 694 Name="VCMIDLTool" 695 TargetEnvironment="3" 696 /> 697 <Tool 698 Name="VCCLCompilerTool" 699 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include" 700 PreprocessorDefinitions="_LIB;HAVE_CONFIG_H" 701 PrecompiledHeaderFile="" 702 /> 703 <Tool 704 Name="VCManagedResourceCompilerTool" 705 /> 706 <Tool 707 Name="VCResourceCompilerTool" 708 /> 709 <Tool 710 Name="VCPreLinkEventTool" 711 /> 712 <Tool 713 Name="VCLibrarianTool" 714 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" 715 /> 716 <Tool 717 Name="VCALinkTool" 718 /> 719 <Tool 720 Name="VCXDCMakeTool" 721 /> 722 <Tool 723 Name="VCBscMakeTool" 724 /> 725 <Tool 726 Name="VCFxCopTool" 727 /> 728 <Tool 729 Name="VCPostBuildEventTool" 730 /> 731 </Configuration> 732 <Configuration 97 733 Name="Debug|Pocket PC 2003 (ARMV4)" 98 734 ConfigurationType="4" … … 227 863 </Configuration> 228 864 <Configuration 229 Name="Debug|x64"230 ConfigurationType="4"231 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops"232 ATLMinimizesCRunTimeLibraryUsage="false"233 CharacterSet="2"234 >235 <Tool236 Name="VCPreBuildEventTool"237 />238 <Tool239 Name="VCCustomBuildTool"240 />241 <Tool242 Name="VCXMLDataGeneratorTool"243 />244 <Tool245 Name="VCWebServiceProxyGeneratorTool"246 />247 <Tool248 Name="VCMIDLTool"249 TargetEnvironment="3"250 />251 <Tool252 Name="VCCLCompilerTool"253 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include"254 PreprocessorDefinitions="_LIB;"255 PrecompiledHeaderFile=""256 DebugInformationFormat="3"257 />258 <Tool259 Name="VCManagedResourceCompilerTool"260 />261 <Tool262 Name="VCResourceCompilerTool"263 />264 <Tool265 Name="VCPreLinkEventTool"266 />267 <Tool268 Name="VCLibrarianTool"269 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"270 />271 <Tool272 Name="VCALinkTool"273 />274 <Tool275 Name="VCXDCMakeTool"276 />277 <Tool278 Name="VCBscMakeTool"279 />280 <Tool281 Name="VCFxCopTool"282 />283 <Tool284 Name="VCPostBuildEventTool"285 />286 </Configuration>287 <Configuration288 Name="Release|Win32"289 ConfigurationType="4"290 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"291 ATLMinimizesCRunTimeLibraryUsage="false"292 CharacterSet="2"293 >294 <Tool295 Name="VCPreBuildEventTool"296 />297 <Tool298 Name="VCCustomBuildTool"299 />300 <Tool301 Name="VCXMLDataGeneratorTool"302 />303 <Tool304 Name="VCWebServiceProxyGeneratorTool"305 />306 <Tool307 Name="VCMIDLTool"308 />309 <Tool310 Name="VCCLCompilerTool"311 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include"312 PreprocessorDefinitions="_LIB;"313 PrecompiledHeaderFile=""314 />315 <Tool316 Name="VCManagedResourceCompilerTool"317 />318 <Tool319 Name="VCResourceCompilerTool"320 />321 <Tool322 Name="VCPreLinkEventTool"323 />324 <Tool325 Name="VCLibrarianTool"326 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"327 />328 <Tool329 Name="VCALinkTool"330 />331 <Tool332 Name="VCXDCMakeTool"333 />334 <Tool335 Name="VCBscMakeTool"336 />337 <Tool338 Name="VCFxCopTool"339 />340 <Tool341 Name="VCPostBuildEventTool"342 />343 </Configuration>344 <Configuration345 865 Name="Release|Pocket PC 2003 (ARMV4)" 346 866 ConfigurationType="4" … … 475 995 </Configuration> 476 996 <Configuration 477 Name="Release|x64"478 ConfigurationType="4"479 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops"480 ATLMinimizesCRunTimeLibraryUsage="false"481 CharacterSet="2"482 >483 <Tool484 Name="VCPreBuildEventTool"485 />486 <Tool487 Name="VCCustomBuildTool"488 />489 <Tool490 Name="VCXMLDataGeneratorTool"491 />492 <Tool493 Name="VCWebServiceProxyGeneratorTool"494 />495 <Tool496 Name="VCMIDLTool"497 TargetEnvironment="3"498 />499 <Tool500 Name="VCCLCompilerTool"501 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include"502 PreprocessorDefinitions="_LIB;"503 PrecompiledHeaderFile=""504 />505 <Tool506 Name="VCManagedResourceCompilerTool"507 />508 <Tool509 Name="VCResourceCompilerTool"510 />511 <Tool512 Name="VCPreLinkEventTool"513 />514 <Tool515 Name="VCLibrarianTool"516 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"517 />518 <Tool519 Name="VCALinkTool"520 />521 <Tool522 Name="VCXDCMakeTool"523 />524 <Tool525 Name="VCBscMakeTool"526 />527 <Tool528 Name="VCFxCopTool"529 />530 <Tool531 Name="VCPostBuildEventTool"532 />533 </Configuration>534 <Configuration535 Name="Debug-Static|Win32"536 ConfigurationType="4"537 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"538 ATLMinimizesCRunTimeLibraryUsage="false"539 CharacterSet="2"540 >541 <Tool542 Name="VCPreBuildEventTool"543 />544 <Tool545 Name="VCCustomBuildTool"546 />547 <Tool548 Name="VCXMLDataGeneratorTool"549 />550 <Tool551 Name="VCWebServiceProxyGeneratorTool"552 />553 <Tool554 Name="VCMIDLTool"555 />556 <Tool557 Name="VCCLCompilerTool"558 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include"559 PreprocessorDefinitions="_LIB;"560 PrecompiledHeaderFile=""561 />562 <Tool563 Name="VCManagedResourceCompilerTool"564 />565 <Tool566 Name="VCResourceCompilerTool"567 />568 <Tool569 Name="VCPreLinkEventTool"570 />571 <Tool572 Name="VCLibrarianTool"573 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"574 />575 <Tool576 Name="VCALinkTool"577 />578 <Tool579 Name="VCXDCMakeTool"580 />581 <Tool582 Name="VCBscMakeTool"583 />584 <Tool585 Name="VCFxCopTool"586 />587 <Tool588 Name="VCPostBuildEventTool"589 />590 </Configuration>591 <Configuration592 997 Name="Debug-Static|Pocket PC 2003 (ARMV4)" 593 998 ConfigurationType="4" … … 722 1127 </Configuration> 723 1128 <Configuration 724 Name="Debug-Static|x64"725 ConfigurationType="4"726 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops"727 ATLMinimizesCRunTimeLibraryUsage="false"728 CharacterSet="2"729 >730 <Tool731 Name="VCPreBuildEventTool"732 />733 <Tool734 Name="VCCustomBuildTool"735 />736 <Tool737 Name="VCXMLDataGeneratorTool"738 />739 <Tool740 Name="VCWebServiceProxyGeneratorTool"741 />742 <Tool743 Name="VCMIDLTool"744 TargetEnvironment="3"745 />746 <Tool747 Name="VCCLCompilerTool"748 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include"749 PreprocessorDefinitions="_LIB;"750 PrecompiledHeaderFile=""751 DebugInformationFormat="3"752 />753 <Tool754 Name="VCManagedResourceCompilerTool"755 />756 <Tool757 Name="VCResourceCompilerTool"758 />759 <Tool760 Name="VCPreLinkEventTool"761 />762 <Tool763 Name="VCLibrarianTool"764 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"765 />766 <Tool767 Name="VCALinkTool"768 />769 <Tool770 Name="VCXDCMakeTool"771 />772 <Tool773 Name="VCBscMakeTool"774 />775 <Tool776 Name="VCFxCopTool"777 />778 <Tool779 Name="VCPostBuildEventTool"780 />781 </Configuration>782 <Configuration783 Name="Release-Dynamic|Win32"784 ConfigurationType="4"785 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"786 ATLMinimizesCRunTimeLibraryUsage="false"787 CharacterSet="2"788 >789 <Tool790 Name="VCPreBuildEventTool"791 />792 <Tool793 Name="VCCustomBuildTool"794 />795 <Tool796 Name="VCXMLDataGeneratorTool"797 />798 <Tool799 Name="VCWebServiceProxyGeneratorTool"800 />801 <Tool802 Name="VCMIDLTool"803 />804 <Tool805 Name="VCCLCompilerTool"806 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include"807 PreprocessorDefinitions="_LIB;"808 PrecompiledHeaderFile=""809 />810 <Tool811 Name="VCManagedResourceCompilerTool"812 />813 <Tool814 Name="VCResourceCompilerTool"815 />816 <Tool817 Name="VCPreLinkEventTool"818 />819 <Tool820 Name="VCLibrarianTool"821 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"822 />823 <Tool824 Name="VCALinkTool"825 />826 <Tool827 Name="VCXDCMakeTool"828 />829 <Tool830 Name="VCBscMakeTool"831 />832 <Tool833 Name="VCFxCopTool"834 />835 <Tool836 Name="VCPostBuildEventTool"837 />838 </Configuration>839 <Configuration840 1129 Name="Release-Dynamic|Pocket PC 2003 (ARMV4)" 841 1130 ConfigurationType="4" … … 970 1259 </Configuration> 971 1260 <Configuration 972 Name="Release-Dynamic|x64"973 ConfigurationType="4"974 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops"975 ATLMinimizesCRunTimeLibraryUsage="false"976 CharacterSet="2"977 >978 <Tool979 Name="VCPreBuildEventTool"980 />981 <Tool982 Name="VCCustomBuildTool"983 />984 <Tool985 Name="VCXMLDataGeneratorTool"986 />987 <Tool988 Name="VCWebServiceProxyGeneratorTool"989 />990 <Tool991 Name="VCMIDLTool"992 TargetEnvironment="3"993 />994 <Tool995 Name="VCCLCompilerTool"996 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include"997 PreprocessorDefinitions="_LIB;"998 PrecompiledHeaderFile=""999 />1000 <Tool1001 Name="VCManagedResourceCompilerTool"1002 />1003 <Tool1004 Name="VCResourceCompilerTool"1005 />1006 <Tool1007 Name="VCPreLinkEventTool"1008 />1009 <Tool1010 Name="VCLibrarianTool"1011 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"1012 />1013 <Tool1014 Name="VCALinkTool"1015 />1016 <Tool1017 Name="VCXDCMakeTool"1018 />1019 <Tool1020 Name="VCBscMakeTool"1021 />1022 <Tool1023 Name="VCFxCopTool"1024 />1025 <Tool1026 Name="VCPostBuildEventTool"1027 />1028 </Configuration>1029 <Configuration1030 Name="Debug-Dynamic|Win32"1031 ConfigurationType="4"1032 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"1033 ATLMinimizesCRunTimeLibraryUsage="false"1034 CharacterSet="2"1035 >1036 <Tool1037 Name="VCPreBuildEventTool"1038 />1039 <Tool1040 Name="VCCustomBuildTool"1041 />1042 <Tool1043 Name="VCXMLDataGeneratorTool"1044 />1045 <Tool1046 Name="VCWebServiceProxyGeneratorTool"1047 />1048 <Tool1049 Name="VCMIDLTool"1050 />1051 <Tool1052 Name="VCCLCompilerTool"1053 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include"1054 PreprocessorDefinitions="_LIB;"1055 PrecompiledHeaderFile=""1056 />1057 <Tool1058 Name="VCManagedResourceCompilerTool"1059 />1060 <Tool1061 Name="VCResourceCompilerTool"1062 />1063 <Tool1064 Name="VCPreLinkEventTool"1065 />1066 <Tool1067 Name="VCLibrarianTool"1068 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"1069 />1070 <Tool1071 Name="VCALinkTool"1072 />1073 <Tool1074 Name="VCXDCMakeTool"1075 />1076 <Tool1077 Name="VCBscMakeTool"1078 />1079 <Tool1080 Name="VCFxCopTool"1081 />1082 <Tool1083 Name="VCPostBuildEventTool"1084 />1085 </Configuration>1086 <Configuration1087 1261 Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)" 1088 1262 ConfigurationType="4" … … 1217 1391 </Configuration> 1218 1392 <Configuration 1219 Name="Debug-Dynamic|x64"1220 ConfigurationType="4"1221 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops"1222 ATLMinimizesCRunTimeLibraryUsage="false"1223 CharacterSet="2"1224 >1225 <Tool1226 Name="VCPreBuildEventTool"1227 />1228 <Tool1229 Name="VCCustomBuildTool"1230 />1231 <Tool1232 Name="VCXMLDataGeneratorTool"1233 />1234 <Tool1235 Name="VCWebServiceProxyGeneratorTool"1236 />1237 <Tool1238 Name="VCMIDLTool"1239 TargetEnvironment="3"1240 />1241 <Tool1242 Name="VCCLCompilerTool"1243 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include"1244 PreprocessorDefinitions="_LIB;"1245 PrecompiledHeaderFile=""1246 DebugInformationFormat="3"1247 />1248 <Tool1249 Name="VCManagedResourceCompilerTool"1250 />1251 <Tool1252 Name="VCResourceCompilerTool"1253 />1254 <Tool1255 Name="VCPreLinkEventTool"1256 />1257 <Tool1258 Name="VCLibrarianTool"1259 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"1260 />1261 <Tool1262 Name="VCALinkTool"1263 />1264 <Tool1265 Name="VCXDCMakeTool"1266 />1267 <Tool1268 Name="VCBscMakeTool"1269 />1270 <Tool1271 Name="VCFxCopTool"1272 />1273 <Tool1274 Name="VCPostBuildEventTool"1275 />1276 </Configuration>1277 <Configuration1278 Name="Release-Static|Win32"1279 ConfigurationType="4"1280 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"1281 ATLMinimizesCRunTimeLibraryUsage="false"1282 CharacterSet="2"1283 >1284 <Tool1285 Name="VCPreBuildEventTool"1286 />1287 <Tool1288 Name="VCCustomBuildTool"1289 />1290 <Tool1291 Name="VCXMLDataGeneratorTool"1292 />1293 <Tool1294 Name="VCWebServiceProxyGeneratorTool"1295 />1296 <Tool1297 Name="VCMIDLTool"1298 />1299 <Tool1300 Name="VCCLCompilerTool"1301 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include"1302 PreprocessorDefinitions="_LIB;"1303 PrecompiledHeaderFile=""1304 />1305 <Tool1306 Name="VCManagedResourceCompilerTool"1307 />1308 <Tool1309 Name="VCResourceCompilerTool"1310 />1311 <Tool1312 Name="VCPreLinkEventTool"1313 />1314 <Tool1315 Name="VCLibrarianTool"1316 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"1317 />1318 <Tool1319 Name="VCALinkTool"1320 />1321 <Tool1322 Name="VCXDCMakeTool"1323 />1324 <Tool1325 Name="VCBscMakeTool"1326 />1327 <Tool1328 Name="VCFxCopTool"1329 />1330 <Tool1331 Name="VCPostBuildEventTool"1332 />1333 </Configuration>1334 <Configuration1335 1393 Name="Release-Static|Pocket PC 2003 (ARMV4)" 1336 1394 ConfigurationType="4" … … 1462 1520 /> 1463 1521 <DebuggerTool 1464 />1465 </Configuration>1466 <Configuration1467 Name="Release-Static|x64"1468 ConfigurationType="4"1469 InheritedPropertySheets="..\..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops"1470 ATLMinimizesCRunTimeLibraryUsage="false"1471 CharacterSet="2"1472 >1473 <Tool1474 Name="VCPreBuildEventTool"1475 />1476 <Tool1477 Name="VCCustomBuildTool"1478 />1479 <Tool1480 Name="VCXMLDataGeneratorTool"1481 />1482 <Tool1483 Name="VCWebServiceProxyGeneratorTool"1484 />1485 <Tool1486 Name="VCMIDLTool"1487 TargetEnvironment="3"1488 />1489 <Tool1490 Name="VCCLCompilerTool"1491 AdditionalIncludeDirectories=".,../../srtp/include,../../srtp/crypto/include,../../../pjlib/include"1492 PreprocessorDefinitions="_LIB;"1493 PrecompiledHeaderFile=""1494 />1495 <Tool1496 Name="VCManagedResourceCompilerTool"1497 />1498 <Tool1499 Name="VCResourceCompilerTool"1500 />1501 <Tool1502 Name="VCPreLinkEventTool"1503 />1504 <Tool1505 Name="VCLibrarianTool"1506 OutputFile="..\..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"1507 />1508 <Tool1509 Name="VCALinkTool"1510 />1511 <Tool1512 Name="VCXDCMakeTool"1513 />1514 <Tool1515 Name="VCBscMakeTool"1516 />1517 <Tool1518 Name="VCFxCopTool"1519 />1520 <Tool1521 Name="VCPostBuildEventTool"1522 1522 /> 1523 1523 </Configuration> … … 3115 3115 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" 3116 3116 > 3117 <File 3118 RelativePath="..\..\srtp\srtp\ekt.c" 3119 > 3120 </File> 3117 3121 <File 3118 3122 RelativePath="..\..\srtp\srtp\srtp.c" … … 3129 3133 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" 3130 3134 > 3135 <File 3136 RelativePath="..\..\srtp\include\ekt.h" 3137 > 3138 </File> 3131 3139 <File 3132 3140 RelativePath="..\..\srtp\include\rtp.h" … … 3150 3158 > 3151 3159 <Filter 3152 Name="ae_xfm"3153 >3154 <File3155 RelativePath="..\..\srtp\crypto\ae_xfm\xfm.c"3156 >3157 </File>3158 </Filter>3159 <Filter3160 3160 Name="cipher" 3161 3161 > -
pjproject/trunk/third_party/build/srtp/srtp_config.h
r4537 r5261 138 138 # endif 139 139 140 # pragma warning(disable:4311)141 # pragma warning(disable:4761) // integral mismatch142 # pragma warning(disable:4018) // signed/unsigned mismatch140 //# pragma warning(disable:4311) 141 //# pragma warning(disable:4761) // integral mismatch 142 //# pragma warning(disable:4018) // signed/unsigned mismatch 143 143 # pragma warning(disable:4244) // conversion from int64 to int 144 144 # pragma warning(disable:4100) // unreferenced formal parameter 145 # pragma warning(disable:4214) // bit field types other than int 146 # pragma warning(disable:4389) // '!=' : signed/unsigned mismatch 147 # pragma warning(disable:4701) // potentially uninitialized local variable used 148 # pragma warning(disable:4702) // unreachable code 145 149 #endif 146 150 … … 221 225 /* #undef size_t */ 222 226 227 /* Define to the full name and version of this package. */ 228 #define PACKAGE_STRING "libsrtp 1.5.4" 229 230 /* Define to the version of this package. */ 231 #define PACKAGE_VERSION "1.5.4" 232 223 233 224 234 #endif /* __SRTP_CONFIG_H__ */ -
pjproject/trunk/third_party/srtp/CHANGES
r1730 r5261 1 1 Changelog 2 3 1.5.4 4 5 Use BE byte ordering of RTCP trailer. 6 7 Allow zero length payload on unprotect. 8 9 1.5.3 10 11 Fix for CVE-2015-6360. 12 13 Pull request 103 - Makefile.in: Don't hard-code ar. 14 15 Pull request 99 - Various fixes for compiling with Visual Studio. 16 17 Pull request 98 - Do not duplicate shared library when installing. 18 19 Please see commit log for a full list of other minor fixes. 20 21 1.5.2 22 23 Autoconf checks for libz and libdl for buildroot support. 24 25 Pull request 96 - Include config.h to get inline on Windows. 26 27 Pull request 93 - Don't include AES-192 when compiling against BoringSSL. 28 29 1.5.1 30 31 Pull request 95 - Additional header check from Chromium 32 33 Pull request 94 - Add missing copyright headers. 34 35 Pull request 90 - Fix out-of-source tree builds. 36 37 Pull request 89 - Introduce little endian RISC support 38 39 Pull request 86 - Add support for cross-compiling the shared library for Windows and OS X 40 41 Pull request 85 - Add -f <pcap filter> option to rtp_decoder 42 43 Pull request 84 - Avoid problems due to unsafe macros 44 45 Pull request 82 - Align the AES ICM nonce 46 47 Pull request 80 - Take advantage of base64 conversion in testapps 48 49 Pull request 75 - Cleanup: miscellaneous cleanup of initial OpenSSL AES support 50 51 Pull request 74 - Allow testing with pcap file or capture - Issue #45 52 53 Other trivial fixes are included as well. Please see github for details. 54 55 1.5.0 56 57 Add support for using OpenSSL crypto using the --enable-openssl 58 option. 59 60 Add support for AES-GCM crypto suites. 61 62 Add support for pkg_config. 63 64 Add user data API to allow user to associate additional data with a 65 SRTP context. 66 67 This release also includes a variety of bug fixes, which can be 68 viewed at: https://github.com/cisco/libsrtp/commits/master 69 70 Note: The change log was not maintained between versions 1.3.20 and 71 1.4.5. 2 72 3 73 1.3.20 -
pjproject/trunk/third_party/srtp/Makefile.in
r1730 r5261 10 10 # libcrypt.a static library implementing crypto engine 11 11 # libsrtp.a static library implementing srtp 12 # libsrtp.so shared library implementing srtp 12 13 # clean removes objects, libs, and executables 13 14 # distribution cleans and builds a .tgz 14 15 # tags builds etags file from all .c and .h files 15 16 16 .PHONY: all test build_table_apps 17 USE_OPENSSL = @USE_OPENSSL@ 18 HAVE_PCAP = @HAVE_PCAP@ 19 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ 20 21 .PHONY: all shared_library test build_table_apps 17 22 18 23 all: test … … 27 32 test/replay_driver$(EXE) -v >/dev/null 28 33 test/dtls_srtp_driver$(EXE) >/dev/null 29 cd test; ./rtpw_test.sh >/dev/null 34 crypto/test/rand_gen_soak$(EXE) -v >/dev/null 35 cd test; $(abspath $(srcdir))/test/rtpw_test.sh >/dev/null 36 ifeq (1, $(USE_OPENSSL)) 37 cd test; $(abspath $(srcdir))/test/rtpw_test_gcm.sh >/dev/null 38 endif 30 39 @echo "libsrtp test applications passed." 31 40 $(MAKE) -C crypto runtest … … 36 45 INCDIR = -Icrypto/include -I$(srcdir)/include -I$(srcdir)/crypto/include 37 46 DEFS = @DEFS@ 38 CPPFLAGS= @CPPFLAGS@47 CPPFLAGS= -fPIC @CPPFLAGS@ 39 48 CFLAGS = @CFLAGS@ 40 49 LIBS = @LIBS@ 41 LDFLAGS = @LDFLAGS@ -L.50 LDFLAGS = -L. @LDFLAGS@ 42 51 COMPILE = $(CC) $(DEFS) $(INCDIR) $(CPPFLAGS) $(CFLAGS) 43 52 SRTPLIB = -lsrtp 44 53 54 AR = @AR@ 45 55 RANLIB = @RANLIB@ 46 56 INSTALL = @INSTALL@ … … 49 59 # null on linux, bsd, and OS X and other OSes. 50 60 EXE = @EXE@ 61 51 62 # gdoi is the group domain of interpretation for isakmp, a group key 52 63 # management system which can provide keys for srtp 53 64 gdoi = @GDOI_OBJS@ 65 54 66 # Random source. 55 67 RNG_OBJS = @RNG_OBJS@ 68 HMAC_OBJS = @HMAC_OBJS@ 69 RNG_EXTRA_OBJS = @RNG_EXTRA_OBJS@ 70 AES_ICM_OBJS = @AES_ICM_OBJS@ 56 71 57 72 srcdir = @srcdir@ … … 63 78 includedir = @includedir@ 64 79 libdir = @libdir@ 65 80 bindir = @bindir@ 81 82 ifeq (1, $(HAVE_PKG_CONFIG)) 83 pkgconfigdir = $(libdir)/pkgconfig 84 pkgconfig_DATA = libsrtp.pc 85 endif 86 87 SHAREDLIBVERSION = 1 88 ifeq (linux,$(findstring linux,@host@)) 89 SHAREDLIB_DIR = $(libdir) 90 SHAREDLIB_LDFLAGS = -shared -Wl,-soname,$@ 91 SHAREDLIBSUFFIXNOVER = so 92 SHAREDLIBSUFFIX = $(SHAREDLIBSUFFIXNOVER).$(SHAREDLIBVERSION) 93 else ifeq (mingw,$(findstring mingw,@host@)) 94 SHAREDLIB_DIR = $(bindir) 95 SHAREDLIB_LDFLAGS = -shared -Wl,--out-implib,libsrtp.dll.a 96 SHAREDLIBVERSION = 97 SHAREDLIBSUFFIXNOVER = dll 98 SHAREDLIBSUFFIX = $(SHAREDLIBSUFFIXNOVER) 99 else ifeq (darwin,$(findstring darwin,@host@)) 100 SHAREDLIB_DIR = $(libdir) 101 SHAREDLIB_LDFLAGS = -dynamiclib -twolevel_namespace -undefined dynamic_lookup \ 102 -fno-common -headerpad_max_install_names -install_name $(libdir)/$@ 103 SHAREDLIBSUFFIXNOVER = dylib 104 SHAREDLIBSUFFIX = $(SHAREDLIBVERSION).$(SHAREDLIBSUFFIXNOVER) 105 endif 66 106 67 107 # implicit rules for object files and test apps … … 76 116 # libcrypt.a (the crypto engine) 77 117 ciphers = crypto/cipher/cipher.o crypto/cipher/null_cipher.o \ 78 crypto/cipher/aes.o crypto/cipher/aes_icm.o \ 79 crypto/cipher/aes_cbc.o 80 81 hashes = crypto/hash/null_auth.o crypto/hash/sha1.o \ 82 crypto/hash/hmac.o crypto/hash/auth.o # crypto/hash/tmmhv2.o 118 $(AES_ICM_OBJS) 119 120 hashes = crypto/hash/null_auth.o crypto/hash/auth.o \ 121 $(HMAC_OBJS) 83 122 84 123 replay = crypto/replay/rdb.o crypto/replay/rdbx.o \ … … 89 128 ust = crypto/ust/ust.o 90 129 91 rng = crypto/rng/$(RNG_OBJS) crypto/rng/prng.o crypto/rng/ctr_prng.o130 rng = crypto/rng/$(RNG_OBJS) $(RNG_EXTRA_OBJS) 92 131 93 132 err = crypto/kernel/err.o … … 100 139 # libsrtp.a (implements srtp processing) 101 140 102 srtpobj = srtp/srtp.o 141 srtpobj = srtp/srtp.o srtp/ekt.o 103 142 104 143 libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi) 105 arcr libsrtp.a $^144 $(AR) cr libsrtp.a $^ 106 145 $(RANLIB) libsrtp.a 146 147 libsrtp.$(SHAREDLIBSUFFIX): $(srtpobj) $(cryptobj) $(gdoi) 148 $(CC) -shared -o $@ $(SHAREDLIB_LDFLAGS) \ 149 $^ $(LDFLAGS) $(LIBS) 150 if [ -n "$(SHAREDLIBVERSION)" ]; then \ 151 ln -sfn $@ libsrtp.$(SHAREDLIBSUFFIXNOVER); \ 152 fi 153 154 shared_library: libsrtp.$(SHAREDLIBSUFFIX) 107 155 108 156 # libcryptomath.a contains general-purpose routines that are used to … … 113 161 114 162 libcryptomath.a: $(cryptomath) 115 arcr libcryptomath.a $(cryptomath)163 $(AR) cr libcryptomath.a $(cryptomath) 116 164 $(RANLIB) libcryptomath.a 117 165 118 166 119 167 # test applications 120 121 crypto_testapp = crypto/test/aes_calc$(EXE) crypto/test/cipher_driver$(EXE) \ 168 ifneq (1, $(USE_OPENSSL)) 169 AES_CALC = crypto/test/aes_calc$(EXE) 170 endif 171 172 crypto_testapp = $(AES_CALC) crypto/test/cipher_driver$(EXE) \ 122 173 crypto/test/datatypes_driver$(EXE) crypto/test/kernel_driver$(EXE) \ 123 174 crypto/test/rand_gen$(EXE) crypto/test/sha1_driver$(EXE) \ 124 crypto/test/stat_driver$(EXE) 175 crypto/test/stat_driver$(EXE) crypto/test/rand_gen_soak$(EXE) 125 176 126 177 testapp = $(crypto_testapp) test/srtp_driver$(EXE) test/replay_driver$(EXE) \ … … 128 179 test/dtls_srtp_driver$(EXE) 129 180 181 ifeq (1, $(HAVE_PCAP)) 182 testapp += test/rtp_decoder$(EXE) 183 endif 184 130 185 $(testapp): libsrtp.a 131 186 132 test/rtpw$(EXE): test/rtpw.c test/rtp.c test/getopt_s.c 133 $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB) 187 test/rtpw$(EXE): test/rtpw.c test/rtp.c test/getopt_s.c \ 188 crypto/math/datatypes.c 189 $(COMPILE) -DTESTAPP_SOURCE=1 $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB) 190 191 ifeq (1, $(HAVE_PCAP)) 192 test/rtp_decoder$(EXE): test/rtp_decoder.c test/rtp.c test/getopt_s.c \ 193 crypto/math/datatypes.c 194 $(COMPILE) -DTESTAPP_SOURCE=1 $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB) 195 endif 134 196 135 197 test/srtp_driver$(EXE): test/srtp_driver.c test/getopt_s.c … … 140 202 141 203 test/dtls_srtp_driver$(EXE): test/dtls_srtp_driver.c test/getopt_s.c 204 $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB) 205 206 crypto/test/cipher_driver$(EXE): crypto/test/cipher_driver.c test/getopt_s.c 207 $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB) 208 209 crypto/test/kernel_driver$(EXE): crypto/test/kernel_driver.c test/getopt_s.c 210 $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB) 211 212 crypto/test/rand_gen$(EXE): crypto/test/rand_gen.c test/getopt_s.c 213 $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB) 214 215 crypto/test/rand_gen_soak$(EXE): crypto/test/rand_gen_soak.c test/getopt_s.c 142 216 $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB) 143 217 … … 187 261 $(MAKE) -C doc 188 262 189 .PHONY: clean superclean install263 .PHONY: clean superclean distclean install 190 264 191 265 install: 192 @if [ -d $(DESTDIR)$(includedir)/srtp ]; then \193 echo "you should run 'make uninstall' first"; exit 1; \194 fi195 266 $(INSTALL) -d $(DESTDIR)$(includedir)/srtp 196 267 $(INSTALL) -d $(DESTDIR)$(libdir) 197 cp include/*.h $(DESTDIR)$(includedir)/srtp 198 cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp 268 cp $(srcdir)/include/*.h $(DESTDIR)$(includedir)/srtp 269 cp $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp 270 if [ "$(srcdir)" != "." ]; then cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi 199 271 if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi 272 if [ -f libsrtp.dll.a ]; then cp libsrtp.dll.a $(DESTDIR)$(libdir)/; fi 273 if [ -f libsrtp.$(SHAREDLIBSUFFIX) ]; then \ 274 $(INSTALL) -d $(DESTDIR)$(SHAREDLIB_DIR); \ 275 cp libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/; \ 276 ln -sfn libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp.$(SHAREDLIBSUFFIXNOVER); \ 277 fi 278 if [ "$(pkgconfig_DATA)" != "" ]; then \ 279 $(INSTALL) -d $(DESTDIR)$(pkgconfigdir); \ 280 cp $(top_builddir)/$(pkgconfig_DATA) $(DESTDIR)$(pkgconfigdir)/; \ 281 fi 200 282 201 283 uninstall: 202 rm -rf $(DESTDIR)$(includedir)/srtp 203 rm -rf $(DESTDIR)$(libdir)/libsrtp.a 284 rm -f $(DESTDIR)$(includedir)/srtp/*.h 285 rm -f $(DESTDIR)$(libdir)/libsrtp.* 286 -rmdir $(DESTDIR)$(includedir)/srtp 287 if [ "$(pkgconfig_DATA)" != "" ]; then \ 288 rm -f $(DESTDIR)$(pkgconfigdir)/$(pkgconfig_DATA); \ 289 fi 204 290 205 291 clean: 206 292 rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \ 207 libcryptomath.a libsrtp.a core *.core test/core293 libcryptomath.a libsrtp.a libsrtp.so libsrtp.dll.a core *.core test/core 208 294 for a in * */* */*/*; do \ 209 295 if [ -f "$$a~" ] ; then rm -f $$a~; fi; \ … … 218 304 superclean: clean 219 305 rm -rf crypto/include/config.h config.log config.cache config.status \ 220 Makefile .gdb_history test/.gdb_history .DS_Store 306 Makefile crypto/Makefile doc/Makefile \ 307 .gdb_history test/.gdb_history .DS_Store 221 308 rm -rf autom4te.cache 222 309 223 distname = srtp-$(shell cat VERSION) 310 distclean: superclean 311 312 distname = libsrtp-$(shell cat VERSION) 224 313 225 314 distribution: runtest superclean … … 228 317 mv ../$(distname).tgz ../$(distname).tgz.bak; \ 229 318 fi 230 cd ..; tar cvzf $(distname).tgz srtp319 cd ..; tar cvzf $(distname).tgz libsrtp 231 320 232 321 # EOF -
pjproject/trunk/third_party/srtp/README
r1730 r5261 27 27 --disable-stdout use stdout for error reporting 28 28 --enable-console use /dev/console for error reporting 29 --enable-openssl use OpenSSL crypto primitives 29 30 --gdoi use GDOI key management (disabled at present) 30 31 31 By default, deb buging is enabled and stdout is used for debugging.32 By default, debugging is enabled and stdout is used for debugging. 32 33 You can use the above configure options to have the debugging output 33 34 sent to syslog or the system console. Alternatively, you can define … … 78 79 using gdoi will be added later. 79 80 80 usage: rtpw [-d <debug>]* [-k <key> [-a][-e]] [-s | -r] dest_ip dest_port81 usage: rtpw [-d <debug>]* [-k|b <key> [-a][-e <key size>][-g]] [-s | -r] dest_ip dest_port 81 82 or rtpw -l 82 83 … … 90 91 -s (s)rtp sender - causes app to send words 91 92 92 -r (s)rtp receive - causes app to rece ve words93 -r (s)rtp receive - causes app to receive words 93 94 94 95 -k <key> use srtp master key <key>, where the … … 96 97 leading "0x") 97 98 98 -e encrypt/decrypt (for data confidentiality) 99 -b <key> same as -k but with base64 encoded key 100 101 -e <keysize> encrypt/decrypt (for data confidentiality) 99 102 (requires use of -k option as well) 103 (use 128, 192, or 256 for keysize) 104 105 -g use AES-GCM mode (must be used with -e) 100 106 101 107 -a message authentication … … 105 111 106 112 -d <debug> turn on debugging for module <debug> 113 -i specify input/output file 114 (instead of using dictionary file) 107 115 108 116 … … 120 128 set k=c1eec3717da76195bb878578790af71c4ee9f859e197a414a78d5abc7451 121 129 122 [sh1]$ test/rtpw -s -k $k -e a 0.0.0.0 9999130 [sh1]$ test/rtpw -s -k $k -e 128 -a 0.0.0.0 9999 123 131 Security services: confidentiality message authentication 124 132 set master key/salt to C1EEC3717DA76195BB878578790AF71C/4EE9F859E197A414A78D5ABC7451 … … 130 138 ... 131 139 132 [sh2]$ test/rtpw -r -k $k -e a 0.0.0.0 9999140 [sh2]$ test/rtpw -r -k $k -e 128 -a 0.0.0.0 9999 133 141 security services: confidentiality message authentication 134 142 set master key/salt to C1EEC3717DA76195BB878578790AF71C/4EE9F859E197A414A78D5ABC7451 -
pjproject/trunk/third_party/srtp/VERSION
r1730 r5261 1 1. 4.41 1.5.4 -
pjproject/trunk/third_party/srtp/config.guess
r1730 r5261 2 2 # Attempt to guess a canonical system name. 3 3 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 4 # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. 5 6 timestamp='2004-09-07' 4 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 5 # 2011 Free Software Foundation, Inc. 6 7 timestamp='2011-06-03' 7 8 8 9 # This file is free software; you can redistribute it and/or modify it … … 18 19 # You should have received a copy of the GNU General Public License 19 20 # along with this program; if not, write to the Free Software 20 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 21 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 22 # 02110-1301, USA. 21 23 # 22 24 # As a special exception to the GNU General Public License, if you … … 25 27 # the same distribution terms that you use for the rest of that program. 26 28 27 # Originally written by Per Bothner <per@bothner.com>. 28 # Please send patches to <config-patches@gnu.org>. Submit a context 29 # diff and a properly formatted ChangeLog entry. 29 30 # Originally written by Per Bothner. Please send patches (context 31 # diff format) to <config-patches@gnu.org> and include a ChangeLog 32 # entry. 30 33 # 31 34 # This script attempts to guess a canonical system name similar to … … 33 36 # exits with 0. Otherwise, it exits with 1. 34 37 # 35 # The plan is that this can be called by configure scripts if you36 # don't specify an explicit build system type.38 # You can get the latest version of this script from: 39 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD 37 40 38 41 me=`echo "$0" | sed -e 's,.*/,,'` … … 54 57 55 58 Originally written by Per Bothner. 56 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 57 Free Software Foundation, Inc. 59 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 60 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free 61 Software Foundation, Inc. 58 62 59 63 This is free software; see the source for copying conditions. There is NO … … 67 71 case $1 in 68 72 --time-stamp | --time* | -t ) 69 echo "$timestamp" ; exit 0;;73 echo "$timestamp" ; exit ;; 70 74 --version | -v ) 71 echo "$version" ; exit 0;;75 echo "$version" ; exit ;; 72 76 --help | --h* | -h ) 73 echo "$usage"; exit 0;;77 echo "$usage"; exit ;; 74 78 -- ) # Stop option processing 75 79 shift; break ;; … … 105 109 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; 106 110 : ${TMPDIR=/tmp} ; 107 { tmp=`(umask 077 && mktemp -d -q"$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||111 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || 108 112 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || 109 113 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || … … 124 128 ,,*) CC_FOR_BUILD=$CC ;; 125 129 ,*,*) CC_FOR_BUILD=$HOST_CC ;; 126 esac ; '130 esac ; set_cc_for_build= ;' 127 131 128 132 # This is needed to find uname on a Pyramid OSx when run in the BSD universe. … … 159 163 sh3el) machine=shl-unknown ;; 160 164 sh3eb) machine=sh-unknown ;; 165 sh5el) machine=sh5le-unknown ;; 161 166 *) machine=${UNAME_MACHINE_ARCH}-unknown ;; 162 167 esac … … 167 172 eval $set_cc_for_build 168 173 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ 169 | grep __ELF__ >/dev/null174 | grep -q __ELF__ 170 175 then 171 176 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). … … 177 182 ;; 178 183 *) 179 184 os=netbsd 180 185 ;; 181 186 esac … … 197 202 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. 198 203 echo "${machine}-${os}${release}" 199 exit 0 ;; 200 amd64:OpenBSD:*:*) 201 echo x86_64-unknown-openbsd${UNAME_RELEASE} 202 exit 0 ;; 203 amiga:OpenBSD:*:*) 204 echo m68k-unknown-openbsd${UNAME_RELEASE} 205 exit 0 ;; 206 cats:OpenBSD:*:*) 207 echo arm-unknown-openbsd${UNAME_RELEASE} 208 exit 0 ;; 209 hp300:OpenBSD:*:*) 210 echo m68k-unknown-openbsd${UNAME_RELEASE} 211 exit 0 ;; 212 luna88k:OpenBSD:*:*) 213 echo m88k-unknown-openbsd${UNAME_RELEASE} 214 exit 0 ;; 215 mac68k:OpenBSD:*:*) 216 echo m68k-unknown-openbsd${UNAME_RELEASE} 217 exit 0 ;; 218 macppc:OpenBSD:*:*) 219 echo powerpc-unknown-openbsd${UNAME_RELEASE} 220 exit 0 ;; 221 mvme68k:OpenBSD:*:*) 222 echo m68k-unknown-openbsd${UNAME_RELEASE} 223 exit 0 ;; 224 mvme88k:OpenBSD:*:*) 225 echo m88k-unknown-openbsd${UNAME_RELEASE} 226 exit 0 ;; 227 mvmeppc:OpenBSD:*:*) 228 echo powerpc-unknown-openbsd${UNAME_RELEASE} 229 exit 0 ;; 230 sgi:OpenBSD:*:*) 231 echo mips64-unknown-openbsd${UNAME_RELEASE} 232 exit 0 ;; 233 sun3:OpenBSD:*:*) 234 echo m68k-unknown-openbsd${UNAME_RELEASE} 235 exit 0 ;; 204 exit ;; 236 205 *:OpenBSD:*:*) 237 echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} 238 exit 0 ;; 206 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` 207 echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} 208 exit ;; 239 209 *:ekkoBSD:*:*) 240 210 echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} 241 exit 0 ;; 211 exit ;; 212 *:SolidBSD:*:*) 213 echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} 214 exit ;; 242 215 macppc:MirBSD:*:*) 243 echo powerp pc-unknown-mirbsd${UNAME_RELEASE}244 exit 0;;216 echo powerpc-unknown-mirbsd${UNAME_RELEASE} 217 exit ;; 245 218 *:MirBSD:*:*) 246 219 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} 247 exit 0;;220 exit ;; 248 221 alpha:OSF1:*:*) 249 222 case $UNAME_RELEASE in … … 252 225 ;; 253 226 *5.*) 254 227 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` 255 228 ;; 256 229 esac … … 298 271 # 1.2 uses "1.2" for uname -r. 299 272 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 300 exit 0 ;; 273 # Reset EXIT trap before exiting to avoid spurious non-zero exit code. 274 exitcode=$? 275 trap '' 0 276 exit $exitcode ;; 301 277 Alpha\ *:Windows_NT*:*) 302 278 # How do we know it's Interix rather than the generic POSIX subsystem? … … 304 280 # of the specific Alpha model? 305 281 echo alpha-pc-interix 306 exit 0;;282 exit ;; 307 283 21064:Windows_NT:50:3) 308 284 echo alpha-dec-winnt3.5 309 exit 0;;285 exit ;; 310 286 Amiga*:UNIX_System_V:4.0:*) 311 287 echo m68k-unknown-sysv4 312 exit 0;;288 exit ;; 313 289 *:[Aa]miga[Oo][Ss]:*:*) 314 290 echo ${UNAME_MACHINE}-unknown-amigaos 315 exit 0;;291 exit ;; 316 292 *:[Mm]orph[Oo][Ss]:*:*) 317 293 echo ${UNAME_MACHINE}-unknown-morphos 318 exit 0;;294 exit ;; 319 295 *:OS/390:*:*) 320 296 echo i370-ibm-openedition 321 exit 0 ;; 297 exit ;; 298 *:z/VM:*:*) 299 echo s390-ibm-zvmoe 300 exit ;; 322 301 *:OS400:*:*) 323 324 exit 0;;302 echo powerpc-ibm-os400 303 exit ;; 325 304 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) 326 305 echo arm-acorn-riscix${UNAME_RELEASE} 327 exit 0;; 306 exit ;; 307 arm:riscos:*:*|arm:RISCOS:*:*) 308 echo arm-unknown-riscos 309 exit ;; 328 310 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) 329 311 echo hppa1.1-hitachi-hiuxmpp 330 exit 0;;312 exit ;; 331 313 Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) 332 314 # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. … … 336 318 echo pyramid-pyramid-bsd 337 319 fi 338 exit 0;;320 exit ;; 339 321 NILE*:*:*:dcosx) 340 322 echo pyramid-pyramid-svr4 341 exit 0;;323 exit ;; 342 324 DRS?6000:unix:4.0:6*) 343 325 echo sparc-icl-nx6 344 exit 0;;345 DRS?6000:UNIX_SV:4.2*:7* )326 exit ;; 327 DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) 346 328 case `/usr/bin/uname -p` in 347 sparc) echo sparc-icl-nx7 && exit 0;;329 sparc) echo sparc-icl-nx7; exit ;; 348 330 esac ;; 331 s390x:SunOS:*:*) 332 echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 333 exit ;; 349 334 sun4H:SunOS:5.*:*) 350 335 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 351 exit 0;;336 exit ;; 352 337 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) 353 338 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 354 exit 0 ;; 355 i86pc:SunOS:5.*:*) 356 echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 357 exit 0 ;; 339 exit ;; 340 i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) 341 echo i386-pc-auroraux${UNAME_RELEASE} 342 exit ;; 343 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) 344 eval $set_cc_for_build 345 SUN_ARCH="i386" 346 # If there is a compiler, see if it is configured for 64-bit objects. 347 # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. 348 # This test works for both compilers. 349 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then 350 if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ 351 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ 352 grep IS_64BIT_ARCH >/dev/null 353 then 354 SUN_ARCH="x86_64" 355 fi 356 fi 357 echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 358 exit ;; 358 359 sun4*:SunOS:6*:*) 359 360 # According to config.sub, this is the proper way to canonicalize … … 361 362 # it's likely to be more like Solaris than SunOS4. 362 363 echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 363 exit 0;;364 exit ;; 364 365 sun4*:SunOS:*:*) 365 366 case "`/usr/bin/arch -k`" in … … 370 371 # Japanese Language versions have a version number like `4.1.3-JL'. 371 372 echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` 372 exit 0;;373 exit ;; 373 374 sun3*:SunOS:*:*) 374 375 echo m68k-sun-sunos${UNAME_RELEASE} 375 exit 0;;376 exit ;; 376 377 sun*:*:4.2BSD:*) 377 378 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` … … 385 386 ;; 386 387 esac 387 exit 0;;388 exit ;; 388 389 aushp:SunOS:*:*) 389 390 echo sparc-auspex-sunos${UNAME_RELEASE} 390 exit 0;;391 exit ;; 391 392 # The situation for MiNT is a little confusing. The machine name 392 393 # can be virtually everything (everything which is not … … 398 399 # be no problem. 399 400 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) 400 401 exit 0;;401 echo m68k-atari-mint${UNAME_RELEASE} 402 exit ;; 402 403 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) 403 404 echo m68k-atari-mint${UNAME_RELEASE} 404 exit 0;;405 exit ;; 405 406 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) 406 407 exit 0;;407 echo m68k-atari-mint${UNAME_RELEASE} 408 exit ;; 408 409 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) 409 410 exit 0;;410 echo m68k-milan-mint${UNAME_RELEASE} 411 exit ;; 411 412 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) 412 413 exit 0;;413 echo m68k-hades-mint${UNAME_RELEASE} 414 exit ;; 414 415 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) 415 416 exit 0;;416 echo m68k-unknown-mint${UNAME_RELEASE} 417 exit ;; 417 418 m68k:machten:*:*) 418 419 echo m68k-apple-machten${UNAME_RELEASE} 419 exit 0;;420 exit ;; 420 421 powerpc:machten:*:*) 421 422 echo powerpc-apple-machten${UNAME_RELEASE} 422 exit 0;;423 exit ;; 423 424 RISC*:Mach:*:*) 424 425 echo mips-dec-mach_bsd4.3 425 exit 0;;426 exit ;; 426 427 RISC*:ULTRIX:*:*) 427 428 echo mips-dec-ultrix${UNAME_RELEASE} 428 exit 0;;429 exit ;; 429 430 VAX*:ULTRIX*:*:*) 430 431 echo vax-dec-ultrix${UNAME_RELEASE} 431 exit 0;;432 exit ;; 432 433 2020:CLIX:*:* | 2430:CLIX:*:*) 433 434 echo clipper-intergraph-clix${UNAME_RELEASE} 434 exit 0;;435 exit ;; 435 436 mips:*:*:UMIPS | mips:*:*:RISCos) 436 437 eval $set_cc_for_build … … 456 457 } 457 458 EOF 458 $CC_FOR_BUILD -o $dummy $dummy.c \ 459 && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ 460 && exit 0 459 $CC_FOR_BUILD -o $dummy $dummy.c && 460 dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && 461 SYSTEM_NAME=`$dummy $dummyarg` && 462 { echo "$SYSTEM_NAME"; exit; } 461 463 echo mips-mips-riscos${UNAME_RELEASE} 462 exit 0;;464 exit ;; 463 465 Motorola:PowerMAX_OS:*:*) 464 466 echo powerpc-motorola-powermax 465 exit 0;;467 exit ;; 466 468 Motorola:*:4.3:PL8-*) 467 469 echo powerpc-harris-powermax 468 exit 0;;470 exit ;; 469 471 Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) 470 472 echo powerpc-harris-powermax 471 exit 0;;473 exit ;; 472 474 Night_Hawk:Power_UNIX:*:*) 473 475 echo powerpc-harris-powerunix 474 exit 0;;476 exit ;; 475 477 m88k:CX/UX:7*:*) 476 478 echo m88k-harris-cxux7 477 exit 0;;479 exit ;; 478 480 m88k:*:4*:R4*) 479 481 echo m88k-motorola-sysv4 480 exit 0;;482 exit ;; 481 483 m88k:*:3*:R3*) 482 484 echo m88k-motorola-sysv3 483 exit 0;;485 exit ;; 484 486 AViiON:dgux:*:*) 485 486 487 # DG/UX returns AViiON for all architectures 488 UNAME_PROCESSOR=`/usr/bin/uname -p` 487 489 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] 488 490 then … … 497 499 echo i586-dg-dgux${UNAME_RELEASE} 498 500 fi 499 exit 0;;501 exit ;; 500 502 M88*:DolphinOS:*:*) # DolphinOS (SVR3) 501 503 echo m88k-dolphin-sysv3 502 exit 0;;504 exit ;; 503 505 M88*:*:R3*:*) 504 506 # Delta 88k system running SVR3 505 507 echo m88k-motorola-sysv3 506 exit 0;;508 exit ;; 507 509 XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) 508 510 echo m88k-tektronix-sysv3 509 exit 0;;511 exit ;; 510 512 Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) 511 513 echo m68k-tektronix-bsd 512 exit 0;;514 exit ;; 513 515 *:IRIX*:*:*) 514 516 echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` 515 exit 0;;517 exit ;; 516 518 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. 517 echo romp-ibm-aix 518 exit 0 ;;# Note that: echo "'`uname -s`'" gives 'AIX '519 echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id 520 exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' 519 521 i*86:AIX:*:*) 520 522 echo i386-ibm-aix 521 exit 0;;523 exit ;; 522 524 ia64:AIX:*:*) 523 525 if [ -x /usr/bin/oslevel ] ; then … … 527 529 fi 528 530 echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} 529 exit 0;;531 exit ;; 530 532 *:AIX:2:3) 531 533 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then … … 542 544 } 543 545 EOF 544 $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 545 echo rs6000-ibm-aix3.2.5 546 if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` 547 then 548 echo "$SYSTEM_NAME" 549 else 550 echo rs6000-ibm-aix3.2.5 551 fi 546 552 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then 547 553 echo rs6000-ibm-aix3.2.4 … … 549 555 echo rs6000-ibm-aix3.2 550 556 fi 551 exit 0;;552 *:AIX:*:[45 ])557 exit ;; 558 *:AIX:*:[4567]) 553 559 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` 554 560 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then … … 563 569 fi 564 570 echo ${IBM_ARCH}-ibm-aix${IBM_REV} 565 exit 0;;571 exit ;; 566 572 *:AIX:*:*) 567 573 echo rs6000-ibm-aix 568 exit 0;;574 exit ;; 569 575 ibmrt:4.4BSD:*|romp-ibm:BSD:*) 570 576 echo romp-ibm-bsd4.4 571 exit 0;;577 exit ;; 572 578 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and 573 579 echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to 574 exit 0 ;;# report: romp-ibm BSD 4.3580 exit ;; # report: romp-ibm BSD 4.3 575 581 *:BOSX:*:*) 576 582 echo rs6000-bull-bosx 577 exit 0;;583 exit ;; 578 584 DPX/2?00:B.O.S.:*:*) 579 585 echo m68k-bull-sysv3 580 exit 0;;586 exit ;; 581 587 9000/[34]??:4.3bsd:1.*:*) 582 588 echo m68k-hp-bsd 583 exit 0;;589 exit ;; 584 590 hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) 585 591 echo m68k-hp-bsd4.4 586 exit 0;;592 exit ;; 587 593 9000/[34678]??:HP-UX:*:*) 588 594 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` … … 593 599 if [ -x /usr/bin/getconf ]; then 594 600 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` 595 596 597 598 599 600 601 602 601 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` 602 case "${sc_cpu_version}" in 603 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 604 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 605 532) # CPU_PA_RISC2_0 606 case "${sc_kernel_bits}" in 607 32) HP_ARCH="hppa2.0n" ;; 608 64) HP_ARCH="hppa2.0w" ;; 603 609 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 604 605 610 esac ;; 611 esac 606 612 fi 607 613 if [ "${HP_ARCH}" = "" ]; then 608 614 eval $set_cc_for_build 609 sed 's/^ 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 615 sed 's/^ //' << EOF >$dummy.c 616 617 #define _HPUX_SOURCE 618 #include <stdlib.h> 619 #include <unistd.h> 620 621 int main () 622 { 623 #if defined(_SC_KERNEL_BITS) 624 long bits = sysconf(_SC_KERNEL_BITS); 625 #endif 626 long cpu = sysconf (_SC_CPU_VERSION); 627 628 switch (cpu) 629 { 630 case CPU_PA_RISC1_0: puts ("hppa1.0"); break; 631 case CPU_PA_RISC1_1: puts ("hppa1.1"); break; 632 case CPU_PA_RISC2_0: 633 #if defined(_SC_KERNEL_BITS) 634 switch (bits) 635 { 636 case 64: puts ("hppa2.0w"); break; 637 case 32: puts ("hppa2.0n"); break; 638 default: puts ("hppa2.0"); break; 639 } break; 640 #else /* !defined(_SC_KERNEL_BITS) */ 641 puts ("hppa2.0"); break; 642 #endif 643 default: puts ("hppa1.0"); break; 644 } 645 exit (0); 646 } 641 647 EOF 642 648 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` … … 646 652 if [ ${HP_ARCH} = "hppa2.0w" ] 647 653 then 648 # avoid double evaluation of $set_cc_for_build 649 test -n "$CC_FOR_BUILD" || eval $set_cc_for_build 650 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null 654 eval $set_cc_for_build 655 656 # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating 657 # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler 658 # generating 64-bit code. GNU and HP use different nomenclature: 659 # 660 # $ CC_FOR_BUILD=cc ./config.guess 661 # => hppa2.0w-hp-hpux11.23 662 # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess 663 # => hppa64-hp-hpux11.23 664 665 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | 666 grep -q __LP64__ 651 667 then 652 668 HP_ARCH="hppa2.0w" … … 656 672 fi 657 673 echo ${HP_ARCH}-hp-hpux${HPUX_REV} 658 exit 0;;674 exit ;; 659 675 ia64:HP-UX:*:*) 660 676 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` 661 677 echo ia64-hp-hpux${HPUX_REV} 662 exit 0;;678 exit ;; 663 679 3050*:HI-UX:*:*) 664 680 eval $set_cc_for_build … … 688 704 } 689 705 EOF 690 $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 706 $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && 707 { echo "$SYSTEM_NAME"; exit; } 691 708 echo unknown-hitachi-hiuxwe2 692 exit 0;;709 exit ;; 693 710 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) 694 711 echo hppa1.1-hp-bsd 695 exit 0;;712 exit ;; 696 713 9000/8??:4.3bsd:*:*) 697 714 echo hppa1.0-hp-bsd 698 exit 0;;715 exit ;; 699 716 *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) 700 717 echo hppa1.0-hp-mpeix 701 exit 0;;718 exit ;; 702 719 hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) 703 720 echo hppa1.1-hp-osf 704 exit 0;;721 exit ;; 705 722 hp8??:OSF1:*:*) 706 723 echo hppa1.0-hp-osf 707 exit 0;;724 exit ;; 708 725 i*86:OSF1:*:*) 709 726 if [ -x /usr/sbin/sysversion ] ; then … … 712 729 echo ${UNAME_MACHINE}-unknown-osf1 713 730 fi 714 exit 0;;731 exit ;; 715 732 parisc*:Lites*:*:*) 716 733 echo hppa1.1-hp-lites 717 exit 0;;734 exit ;; 718 735 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) 719 736 echo c1-convex-bsd 720 exit 0;;737 exit ;; 721 738 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) 722 739 if getsysinfo -f scalar_acc … … 724 741 else echo c2-convex-bsd 725 742 fi 726 exit 0;;743 exit ;; 727 744 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) 728 745 echo c34-convex-bsd 729 exit 0;;746 exit ;; 730 747 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) 731 748 echo c38-convex-bsd 732 exit 0;;749 exit ;; 733 750 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) 734 751 echo c4-convex-bsd 735 exit 0;;752 exit ;; 736 753 CRAY*Y-MP:*:*:*) 737 754 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 738 exit 0;;755 exit ;; 739 756 CRAY*[A-Z]90:*:*:*) 740 757 echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ … … 742 759 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ 743 760 -e 's/\.[^.]*$/.X/' 744 exit 0;;761 exit ;; 745 762 CRAY*TS:*:*:*) 746 763 echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 747 exit 0;;764 exit ;; 748 765 CRAY*T3E:*:*:*) 749 766 echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 750 exit 0;;767 exit ;; 751 768 CRAY*SV1:*:*:*) 752 769 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 753 exit 0;;770 exit ;; 754 771 *:UNICOS/mp:*:*) 755 772 echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 756 exit 0;;773 exit ;; 757 774 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) 758 775 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 759 760 761 762 exit 0;;776 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 777 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` 778 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 779 exit ;; 763 780 5000:UNIX_System_V:4.*:*) 764 765 766 767 exit 0;;781 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 782 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` 783 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 784 exit ;; 768 785 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) 769 786 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} 770 exit 0;;787 exit ;; 771 788 sparc*:BSD/OS:*:*) 772 789 echo sparc-unknown-bsdi${UNAME_RELEASE} 773 exit 0;;790 exit ;; 774 791 *:BSD/OS:*:*) 775 792 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} 776 exit 0;;793 exit ;; 777 794 *:FreeBSD:*:*) 778 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 779 exit 0 ;; 795 case ${UNAME_MACHINE} in 796 pc98) 797 echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 798 amd64) 799 echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 800 *) 801 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 802 esac 803 exit ;; 780 804 i*:CYGWIN*:*) 781 805 echo ${UNAME_MACHINE}-pc-cygwin 782 exit 0;;783 i*:MINGW*:*)806 exit ;; 807 *:MINGW*:*) 784 808 echo ${UNAME_MACHINE}-pc-mingw32 785 exit 0 ;; 809 exit ;; 810 i*:windows32*:*) 811 # uname -m includes "-pc" on this system. 812 echo ${UNAME_MACHINE}-mingw32 813 exit ;; 786 814 i*:PW*:*) 787 815 echo ${UNAME_MACHINE}-pc-pw32 788 exit 0 ;; 789 x86:Interix*:[34]*) 790 echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' 791 exit 0 ;; 816 exit ;; 817 *:Interix*:*) 818 case ${UNAME_MACHINE} in 819 x86) 820 echo i586-pc-interix${UNAME_RELEASE} 821 exit ;; 822 authenticamd | genuineintel | EM64T) 823 echo x86_64-unknown-interix${UNAME_RELEASE} 824 exit ;; 825 IA64) 826 echo ia64-unknown-interix${UNAME_RELEASE} 827 exit ;; 828 esac ;; 792 829 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) 793 830 echo i${UNAME_MACHINE}-pc-mks 794 exit 0 ;; 831 exit ;; 832 8664:Windows_NT:*) 833 echo x86_64-pc-mks 834 exit ;; 795 835 i*:Windows_NT*:* | Pentium*:Windows_NT*:*) 796 836 # How do we know it's Interix rather than the generic POSIX subsystem? … … 798 838 # UNAME_MACHINE based on the output of uname instead of i386? 799 839 echo i586-pc-interix 800 exit 0;;840 exit ;; 801 841 i*:UWIN*:*) 802 842 echo ${UNAME_MACHINE}-pc-uwin 803 exit 0 ;; 843 exit ;; 844 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) 845 echo x86_64-unknown-cygwin 846 exit ;; 804 847 p*:CYGWIN*:*) 805 848 echo powerpcle-unknown-cygwin 806 exit 0;;849 exit ;; 807 850 prep*:SunOS:5.*:*) 808 851 echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 809 exit 0;;852 exit ;; 810 853 *:GNU:*:*) 811 854 # the GNU system 812 855 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` 813 exit 0;;856 exit ;; 814 857 *:GNU/*:*:*) 815 858 # other systems with GNU libc and userland 816 859 echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu 817 exit 0;;860 exit ;; 818 861 i*86:Minix:*:*) 819 862 echo ${UNAME_MACHINE}-pc-minix 820 exit 0 ;; 821 arm*:Linux:*:*) 822 echo ${UNAME_MACHINE}-unknown-linux-gnu 823 exit 0 ;; 824 cris:Linux:*:*) 825 echo cris-axis-linux-gnu 826 exit 0 ;; 827 crisv32:Linux:*:*) 828 echo crisv32-axis-linux-gnu 829 exit 0 ;; 830 frv:Linux:*:*) 831 echo frv-unknown-linux-gnu 832 exit 0 ;; 833 ia64:Linux:*:*) 834 echo ${UNAME_MACHINE}-unknown-linux-gnu 835 exit 0 ;; 836 m32r*:Linux:*:*) 837 echo ${UNAME_MACHINE}-unknown-linux-gnu 838 exit 0 ;; 839 m68*:Linux:*:*) 840 echo ${UNAME_MACHINE}-unknown-linux-gnu 841 exit 0 ;; 842 mips:Linux:*:*) 843 eval $set_cc_for_build 844 sed 's/^ //' << EOF >$dummy.c 845 #undef CPU 846 #undef mips 847 #undef mipsel 848 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 849 CPU=mipsel 850 #else 851 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 852 CPU=mips 853 #else 854 CPU= 855 #endif 856 #endif 857 EOF 858 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` 859 test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 860 ;; 861 mips64:Linux:*:*) 862 eval $set_cc_for_build 863 sed 's/^ //' << EOF >$dummy.c 864 #undef CPU 865 #undef mips64 866 #undef mips64el 867 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 868 CPU=mips64el 869 #else 870 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 871 CPU=mips64 872 #else 873 CPU= 874 #endif 875 #endif 876 EOF 877 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` 878 test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 879 ;; 880 ppc:Linux:*:*) 881 echo powerpc-unknown-linux-gnu 882 exit 0 ;; 883 ppc64:Linux:*:*) 884 echo powerpc64-unknown-linux-gnu 885 exit 0 ;; 863 exit ;; 886 864 alpha:Linux:*:*) 887 865 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in … … 893 871 EV67) UNAME_MACHINE=alphaev67 ;; 894 872 EV68*) UNAME_MACHINE=alphaev68 ;; 895 896 objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null873 esac 874 objdump --private-headers /bin/sh | grep -q ld.so.1 897 875 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi 898 876 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} 899 exit 0 ;; 877 exit ;; 878 arm*:Linux:*:*) 879 eval $set_cc_for_build 880 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ 881 | grep -q __ARM_EABI__ 882 then 883 echo ${UNAME_MACHINE}-unknown-linux-gnu 884 else 885 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ 886 | grep -q __ARM_PCS_VFP 887 then 888 echo ${UNAME_MACHINE}-unknown-linux-gnueabi 889 else 890 echo ${UNAME_MACHINE}-unknown-linux-gnueabihf 891 fi 892 fi 893 exit ;; 894 avr32*:Linux:*:*) 895 echo ${UNAME_MACHINE}-unknown-linux-gnu 896 exit ;; 897 cris:Linux:*:*) 898 echo cris-axis-linux-gnu 899 exit ;; 900 crisv32:Linux:*:*) 901 echo crisv32-axis-linux-gnu 902 exit ;; 903 frv:Linux:*:*) 904 echo frv-unknown-linux-gnu 905 exit ;; 906 i*86:Linux:*:*) 907 LIBC=gnu 908 eval $set_cc_for_build 909 sed 's/^ //' << EOF >$dummy.c 910 #ifdef __dietlibc__ 911 LIBC=dietlibc 912 #endif 913 EOF 914 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` 915 echo "${UNAME_MACHINE}-pc-linux-${LIBC}" 916 exit ;; 917 ia64:Linux:*:*) 918 echo ${UNAME_MACHINE}-unknown-linux-gnu 919 exit ;; 920 m32r*:Linux:*:*) 921 echo ${UNAME_MACHINE}-unknown-linux-gnu 922 exit ;; 923 m68*:Linux:*:*) 924 echo ${UNAME_MACHINE}-unknown-linux-gnu 925 exit ;; 926 mips:Linux:*:* | mips64:Linux:*:*) 927 eval $set_cc_for_build 928 sed 's/^ //' << EOF >$dummy.c 929 #undef CPU 930 #undef ${UNAME_MACHINE} 931 #undef ${UNAME_MACHINE}el 932 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 933 CPU=${UNAME_MACHINE}el 934 #else 935 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 936 CPU=${UNAME_MACHINE} 937 #else 938 CPU= 939 #endif 940 #endif 941 EOF 942 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` 943 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 944 ;; 945 or32:Linux:*:*) 946 echo or32-unknown-linux-gnu 947 exit ;; 948 padre:Linux:*:*) 949 echo sparc-unknown-linux-gnu 950 exit ;; 951 parisc64:Linux:*:* | hppa64:Linux:*:*) 952 echo hppa64-unknown-linux-gnu 953 exit ;; 900 954 parisc:Linux:*:* | hppa:Linux:*:*) 901 955 # Look for CPU level … … 905 959 *) echo hppa-unknown-linux-gnu ;; 906 960 esac 907 exit 0 ;; 908 parisc64:Linux:*:* | hppa64:Linux:*:*) 909 echo hppa64-unknown-linux-gnu 910 exit 0 ;; 961 exit ;; 962 ppc64:Linux:*:*) 963 echo powerpc64-unknown-linux-gnu 964 exit ;; 965 ppc:Linux:*:*) 966 echo powerpc-unknown-linux-gnu 967 exit ;; 911 968 s390:Linux:*:* | s390x:Linux:*:*) 912 969 echo ${UNAME_MACHINE}-ibm-linux 913 exit 0;;970 exit ;; 914 971 sh64*:Linux:*:*) 915 916 exit 0;;972 echo ${UNAME_MACHINE}-unknown-linux-gnu 973 exit ;; 917 974 sh*:Linux:*:*) 918 975 echo ${UNAME_MACHINE}-unknown-linux-gnu 919 exit 0;;976 exit ;; 920 977 sparc:Linux:*:* | sparc64:Linux:*:*) 921 978 echo ${UNAME_MACHINE}-unknown-linux-gnu 922 exit 0 ;; 979 exit ;; 980 tile*:Linux:*:*) 981 echo ${UNAME_MACHINE}-unknown-linux-gnu 982 exit ;; 983 vax:Linux:*:*) 984 echo ${UNAME_MACHINE}-dec-linux-gnu 985 exit ;; 923 986 x86_64:Linux:*:*) 924 987 echo x86_64-unknown-linux-gnu 925 exit 0 ;; 926 i*86:Linux:*:*) 927 # The BFD linker knows what the default object file format is, so 928 # first see if it will tell us. cd to the root directory to prevent 929 # problems with other programs or directories called `ld' in the path. 930 # Set LC_ALL=C to ensure ld outputs messages in English. 931 ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ 932 | sed -ne '/supported targets:/!d 933 s/[ ][ ]*/ /g 934 s/.*supported targets: *// 935 s/ .*// 936 p'` 937 case "$ld_supported_targets" in 938 elf32-i386) 939 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" 940 ;; 941 a.out-i386-linux) 942 echo "${UNAME_MACHINE}-pc-linux-gnuaout" 943 exit 0 ;; 944 coff-i386) 945 echo "${UNAME_MACHINE}-pc-linux-gnucoff" 946 exit 0 ;; 947 "") 948 # Either a pre-BFD a.out linker (linux-gnuoldld) or 949 # one that does not give us useful --help. 950 echo "${UNAME_MACHINE}-pc-linux-gnuoldld" 951 exit 0 ;; 952 esac 953 # Determine whether the default compiler is a.out or elf 954 eval $set_cc_for_build 955 sed 's/^ //' << EOF >$dummy.c 956 #include <features.h> 957 #ifdef __ELF__ 958 # ifdef __GLIBC__ 959 # if __GLIBC__ >= 2 960 LIBC=gnu 961 # else 962 LIBC=gnulibc1 963 # endif 964 # else 965 LIBC=gnulibc1 966 # endif 967 #else 968 #ifdef __INTEL_COMPILER 969 LIBC=gnu 970 #else 971 LIBC=gnuaout 972 #endif 973 #endif 974 #ifdef __dietlibc__ 975 LIBC=dietlibc 976 #endif 977 EOF 978 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` 979 test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 980 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 981 ;; 988 exit ;; 989 xtensa*:Linux:*:*) 990 echo ${UNAME_MACHINE}-unknown-linux-gnu 991 exit ;; 982 992 i*86:DYNIX/ptx:4*:*) 983 993 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. … … 985 995 # sysname and nodename. 986 996 echo i386-sequent-sysv4 987 exit 0;;997 exit ;; 988 998 i*86:UNIX_SV:4.2MP:2.*) 989 990 991 999 # Unixware is an offshoot of SVR4, but it has its own version 1000 # number series starting with 2... 1001 # I am not positive that other SVR4 systems won't match this, 992 1002 # I just have to hope. -- rms. 993 1003 # Use sysv4.2uw... so that sysv4* matches it. 994 1004 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} 995 exit 0;;1005 exit ;; 996 1006 i*86:OS/2:*:*) 997 1007 # If we were able to find `uname', then EMX Unix compatibility 998 1008 # is probably installed. 999 1009 echo ${UNAME_MACHINE}-pc-os2-emx 1000 exit 0;;1010 exit ;; 1001 1011 i*86:XTS-300:*:STOP) 1002 1012 echo ${UNAME_MACHINE}-unknown-stop 1003 exit 0;;1013 exit ;; 1004 1014 i*86:atheos:*:*) 1005 1015 echo ${UNAME_MACHINE}-unknown-atheos 1006 exit 0;;1007 1016 exit ;; 1017 i*86:syllable:*:*) 1008 1018 echo ${UNAME_MACHINE}-pc-syllable 1009 exit 0;;1010 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4. 0*:*)1019 exit ;; 1020 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) 1011 1021 echo i386-unknown-lynxos${UNAME_RELEASE} 1012 exit 0;;1022 exit ;; 1013 1023 i*86:*DOS:*:*) 1014 1024 echo ${UNAME_MACHINE}-pc-msdosdjgpp 1015 exit 0;;1025 exit ;; 1016 1026 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) 1017 1027 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` … … 1021 1031 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} 1022 1032 fi 1023 exit 0 ;; 1024 i*86:*:5:[78]*) 1033 exit ;; 1034 i*86:*:5:[678]*) 1035 # UnixWare 7.x, OpenUNIX and OpenServer 6. 1025 1036 case `/bin/uname -X | grep "^Machine"` in 1026 1037 *486*) UNAME_MACHINE=i486 ;; … … 1029 1040 esac 1030 1041 echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} 1031 exit 0;;1042 exit ;; 1032 1043 i*86:*:3.2:*) 1033 1044 if test -f /usr/options/cb.name; then … … 1047 1058 echo ${UNAME_MACHINE}-pc-sysv32 1048 1059 fi 1049 exit 0;;1060 exit ;; 1050 1061 pc:*:*:*) 1051 1062 # Left here for compatibility: 1052 # uname -m prints for DJGPP always 'pc', but it prints nothing about 1053 # the processor, so we play safe by assuming i386. 1054 echo i386-pc-msdosdjgpp 1055 exit 0 ;; 1063 # uname -m prints for DJGPP always 'pc', but it prints nothing about 1064 # the processor, so we play safe by assuming i586. 1065 # Note: whatever this is, it MUST be the same as what config.sub 1066 # prints for the "djgpp" host, or else GDB configury will decide that 1067 # this is a cross-build. 1068 echo i586-pc-msdosdjgpp 1069 exit ;; 1056 1070 Intel:Mach:3*:*) 1057 1071 echo i386-pc-mach3 1058 exit 0;;1072 exit ;; 1059 1073 paragon:*:*:*) 1060 1074 echo i860-intel-osf1 1061 exit 0;;1075 exit ;; 1062 1076 i860:*:4.*:*) # i860-SVR4 1063 1077 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then … … 1066 1080 echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 1067 1081 fi 1068 exit 0;;1082 exit ;; 1069 1083 mini*:CTIX:SYS*5:*) 1070 1084 # "miniframe" 1071 1085 echo m68010-convergent-sysv 1072 exit 0;;1086 exit ;; 1073 1087 mc68k:UNIX:SYSTEM5:3.51m) 1074 1088 echo m68k-convergent-sysv 1075 exit 0;;1089 exit ;; 1076 1090 M680?0:D-NIX:5.3:*) 1077 1091 echo m68k-diab-dnix 1078 exit 0;;1092 exit ;; 1079 1093 M68*:*:R3V[5678]*:*) 1080 test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0;;1094 test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 1081 1095 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) 1082 1096 OS_REL='' … … 1084 1098 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` 1085 1099 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1086 && echo i486-ncr-sysv4.3${OS_REL} && exit 01100 && { echo i486-ncr-sysv4.3${OS_REL}; exit; } 1087 1101 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ 1088 && echo i586-ncr-sysv4.3${OS_REL} && exit 0;;1102 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 1089 1103 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) 1090 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1091 && echo i486-ncr-sysv4 && exit 0 ;; 1104 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1105 && { echo i486-ncr-sysv4; exit; } ;; 1106 NCR*:*:4.2:* | MPRAS*:*:4.2:*) 1107 OS_REL='.3' 1108 test -r /etc/.relid \ 1109 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` 1110 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1111 && { echo i486-ncr-sysv4.3${OS_REL}; exit; } 1112 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ 1113 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } 1114 /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ 1115 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 1092 1116 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) 1093 1117 echo m68k-unknown-lynxos${UNAME_RELEASE} 1094 exit 0;;1118 exit ;; 1095 1119 mc68030:UNIX_System_V:4.*:*) 1096 1120 echo m68k-atari-sysv4 1097 exit 0;;1121 exit ;; 1098 1122 TSUNAMI:LynxOS:2.*:*) 1099 1123 echo sparc-unknown-lynxos${UNAME_RELEASE} 1100 exit 0;;1124 exit ;; 1101 1125 rs6000:LynxOS:2.*:*) 1102 1126 echo rs6000-unknown-lynxos${UNAME_RELEASE} 1103 exit 0;;1104 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4. 0*:*)1127 exit ;; 1128 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) 1105 1129 echo powerpc-unknown-lynxos${UNAME_RELEASE} 1106 exit 0;;1130 exit ;; 1107 1131 SM[BE]S:UNIX_SV:*:*) 1108 1132 echo mips-dde-sysv${UNAME_RELEASE} 1109 exit 0;;1133 exit ;; 1110 1134 RM*:ReliantUNIX-*:*:*) 1111 1135 echo mips-sni-sysv4 1112 exit 0;;1136 exit ;; 1113 1137 RM*:SINIX-*:*:*) 1114 1138 echo mips-sni-sysv4 1115 exit 0;;1139 exit ;; 1116 1140 *:SINIX-*:*:*) 1117 1141 if uname -p 2>/dev/null >/dev/null ; then … … 1121 1145 echo ns32k-sni-sysv 1122 1146 fi 1123 exit 0;;1124 PENTIUM:*:4.0*:*) 1125 1126 1127 exit 0;;1147 exit ;; 1148 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort 1149 # says <Richard.M.Bartel@ccMail.Census.GOV> 1150 echo i586-unisys-sysv4 1151 exit ;; 1128 1152 *:UNIX_System_V:4*:FTX*) 1129 1153 # From Gerald Hewes <hewes@openmarket.com>. 1130 1154 # How about differentiating between stratus architectures? -djm 1131 1155 echo hppa1.1-stratus-sysv4 1132 exit 0;;1156 exit ;; 1133 1157 *:*:*:FTX*) 1134 1158 # From seanf@swdc.stratus.com. 1135 1159 echo i860-stratus-sysv4 1136 exit 0 ;; 1160 exit ;; 1161 i*86:VOS:*:*) 1162 # From Paul.Green@stratus.com. 1163 echo ${UNAME_MACHINE}-stratus-vos 1164 exit ;; 1137 1165 *:VOS:*:*) 1138 1166 # From Paul.Green@stratus.com. 1139 1167 echo hppa1.1-stratus-vos 1140 exit 0;;1168 exit ;; 1141 1169 mc68*:A/UX:*:*) 1142 1170 echo m68k-apple-aux${UNAME_RELEASE} 1143 exit 0;;1171 exit ;; 1144 1172 news*:NEWS-OS:6*:*) 1145 1173 echo mips-sony-newsos6 1146 exit 0;;1174 exit ;; 1147 1175 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) 1148 1176 if [ -d /usr/nec ]; then 1149 1177 echo mips-nec-sysv${UNAME_RELEASE} 1150 1178 else 1151 1152 fi 1153 exit 0;;1179 echo mips-unknown-sysv${UNAME_RELEASE} 1180 fi 1181 exit ;; 1154 1182 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. 1155 1183 echo powerpc-be-beos 1156 exit 0;;1184 exit ;; 1157 1185 BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. 1158 1186 echo powerpc-apple-beos 1159 exit 0;;1187 exit ;; 1160 1188 BePC:BeOS:*:*) # BeOS running on Intel PC compatible. 1161 1189 echo i586-pc-beos 1162 exit 0 ;; 1190 exit ;; 1191 BePC:Haiku:*:*) # Haiku running on Intel PC compatible. 1192 echo i586-pc-haiku 1193 exit ;; 1163 1194 SX-4:SUPER-UX:*:*) 1164 1195 echo sx4-nec-superux${UNAME_RELEASE} 1165 exit 0;;1196 exit ;; 1166 1197 SX-5:SUPER-UX:*:*) 1167 1198 echo sx5-nec-superux${UNAME_RELEASE} 1168 exit 0;;1199 exit ;; 1169 1200 SX-6:SUPER-UX:*:*) 1170 1201 echo sx6-nec-superux${UNAME_RELEASE} 1171 exit 0 ;; 1202 exit ;; 1203 SX-7:SUPER-UX:*:*) 1204 echo sx7-nec-superux${UNAME_RELEASE} 1205 exit ;; 1206 SX-8:SUPER-UX:*:*) 1207 echo sx8-nec-superux${UNAME_RELEASE} 1208 exit ;; 1209 SX-8R:SUPER-UX:*:*) 1210 echo sx8r-nec-superux${UNAME_RELEASE} 1211 exit ;; 1172 1212 Power*:Rhapsody:*:*) 1173 1213 echo powerpc-apple-rhapsody${UNAME_RELEASE} 1174 exit 0;;1214 exit ;; 1175 1215 *:Rhapsody:*:*) 1176 1216 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} 1177 exit 0;;1217 exit ;; 1178 1218 *:Darwin:*:*) 1179 1219 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown 1180 1220 case $UNAME_PROCESSOR in 1181 *86) UNAME_PROCESSOR=i686 ;; 1221 i386) 1222 eval $set_cc_for_build 1223 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then 1224 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ 1225 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ 1226 grep IS_64BIT_ARCH >/dev/null 1227 then 1228 UNAME_PROCESSOR="x86_64" 1229 fi 1230 fi ;; 1182 1231 unknown) UNAME_PROCESSOR=powerpc ;; 1183 1232 esac 1184 1233 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} 1185 exit 0;;1234 exit ;; 1186 1235 *:procnto*:*:* | *:QNX:[0123456789]*:*) 1187 1236 UNAME_PROCESSOR=`uname -p` … … 1191 1240 fi 1192 1241 echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} 1193 exit 0;;1242 exit ;; 1194 1243 *:QNX:*:4*) 1195 1244 echo i386-pc-qnx 1196 exit 0 ;; 1245 exit ;; 1246 NEO-?:NONSTOP_KERNEL:*:*) 1247 echo neo-tandem-nsk${UNAME_RELEASE} 1248 exit ;; 1249 NSE-?:NONSTOP_KERNEL:*:*) 1250 echo nse-tandem-nsk${UNAME_RELEASE} 1251 exit ;; 1197 1252 NSR-?:NONSTOP_KERNEL:*:*) 1198 1253 echo nsr-tandem-nsk${UNAME_RELEASE} 1199 exit 0;;1254 exit ;; 1200 1255 *:NonStop-UX:*:*) 1201 1256 echo mips-compaq-nonstopux 1202 exit 0;;1257 exit ;; 1203 1258 BS2000:POSIX*:*:*) 1204 1259 echo bs2000-siemens-sysv 1205 exit 0;;1260 exit ;; 1206 1261 DS/*:UNIX_System_V:*:*) 1207 1262 echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} 1208 exit 0;;1263 exit ;; 1209 1264 *:Plan9:*:*) 1210 1265 # "uname -m" is not consistent, so use $cputype instead. 386 … … 1217 1272 fi 1218 1273 echo ${UNAME_MACHINE}-unknown-plan9 1219 exit 0;;1274 exit ;; 1220 1275 *:TOPS-10:*:*) 1221 1276 echo pdp10-unknown-tops10 1222 exit 0;;1277 exit ;; 1223 1278 *:TENEX:*:*) 1224 1279 echo pdp10-unknown-tenex 1225 exit 0;;1280 exit ;; 1226 1281 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) 1227 1282 echo pdp10-dec-tops20 1228 exit 0;;1283 exit ;; 1229 1284 XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) 1230 1285 echo pdp10-xkl-tops20 1231 exit 0;;1286 exit ;; 1232 1287 *:TOPS-20:*:*) 1233 1288 echo pdp10-unknown-tops20 1234 exit 0;;1289 exit ;; 1235 1290 *:ITS:*:*) 1236 1291 echo pdp10-unknown-its 1237 exit 0;;1292 exit ;; 1238 1293 SEI:*:*:SEIUX) 1239 1240 exit 0;;1294 echo mips-sei-seiux${UNAME_RELEASE} 1295 exit ;; 1241 1296 *:DragonFly:*:*) 1242 1297 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 1243 exit 0;;1298 exit ;; 1244 1299 *:*VMS:*:*) 1245 1300 UNAME_MACHINE=`(uname -p) 2>/dev/null` 1246 1301 case "${UNAME_MACHINE}" in 1247 A*) echo alpha-dec-vms && exit 0 ;; 1248 I*) echo ia64-dec-vms && exit 0 ;; 1249 V*) echo vax-dec-vms && exit 0 ;; 1250 esac 1302 A*) echo alpha-dec-vms ; exit ;; 1303 I*) echo ia64-dec-vms ; exit ;; 1304 V*) echo vax-dec-vms ; exit ;; 1305 esac ;; 1306 *:XENIX:*:SysV) 1307 echo i386-pc-xenix 1308 exit ;; 1309 i*86:skyos:*:*) 1310 echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' 1311 exit ;; 1312 i*86:rdos:*:*) 1313 echo ${UNAME_MACHINE}-pc-rdos 1314 exit ;; 1315 i*86:AROS:*:*) 1316 echo ${UNAME_MACHINE}-pc-aros 1317 exit ;; 1251 1318 esac 1252 1319 … … 1271 1338 printf ("m68k-sony-newsos%s\n", 1272 1339 #ifdef NEWSOS4 1273 1340 "4" 1274 1341 #else 1275 1276 #endif 1277 1342 "" 1343 #endif 1344 ); exit (0); 1278 1345 #endif 1279 1346 #endif 1280 1347 1281 1348 #if defined (__arm) && defined (__acorn) && defined (__unix) 1282 printf ("arm-acorn-riscix "); exit (0);1349 printf ("arm-acorn-riscix\n"); exit (0); 1283 1350 #endif 1284 1351 … … 1369 1436 EOF 1370 1437 1371 $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 1438 $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && 1439 { echo "$SYSTEM_NAME"; exit; } 1372 1440 1373 1441 # Apollos put the system type in the environment. 1374 1442 1375 test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }1443 test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } 1376 1444 1377 1445 # Convex versions that predate uname can use getsysinfo(1) … … 1382 1450 c1*) 1383 1451 echo c1-convex-bsd 1384 exit 0;;1452 exit ;; 1385 1453 c2*) 1386 1454 if getsysinfo -f scalar_acc … … 1388 1456 else echo c2-convex-bsd 1389 1457 fi 1390 exit 0;;1458 exit ;; 1391 1459 c34*) 1392 1460 echo c34-convex-bsd 1393 exit 0;;1461 exit ;; 1394 1462 c38*) 1395 1463 echo c38-convex-bsd 1396 exit 0;;1464 exit ;; 1397 1465 c4*) 1398 1466 echo c4-convex-bsd 1399 exit 0;;1467 exit ;; 1400 1468 esac 1401 1469 fi … … 1408 1476 download the most up to date version of the config scripts from 1409 1477 1410 ftp://ftp.gnu.org/pub/gnu/config/ 1478 http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD 1479 and 1480 http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD 1411 1481 1412 1482 If the version you run ($0) is already up to date, please -
pjproject/trunk/third_party/srtp/config.h_win32vc7
r1730 r5261 1 1 /* Hacked config.h for Windows XP 32-bit & VC7 */ 2 3 #ifdef (_MSC_VER >= 1400) 4 # define HAVE_RAND_S 1 5 #endif 2 6 3 7 /* Define if building for a CISC machine (e.g. Intel). */ -
pjproject/trunk/third_party/srtp/config.hw
r1730 r5261 1 1 /* crypto/include/config.h. Generated by configure. */ 2 2 /* config_in.h. Generated from configure.in by autoheader. */ 3 4 #if (_MSC_VER >= 1400) 5 # define HAVE_RAND_S 1 6 #endif 3 7 4 8 /* Define if building for a CISC machine (e.g. Intel). */ -
pjproject/trunk/third_party/srtp/config.sub
r1730 r5261 2 2 # Configuration validation subroutine script. 3 3 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 4 # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. 5 6 timestamp='2004-08-29' 4 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 5 # 2011 Free Software Foundation, Inc. 6 7 timestamp='2011-06-03' 7 8 8 9 # This file is (in principle) common to ALL GNU software. … … 22 23 # You should have received a copy of the GNU General Public License 23 24 # along with this program; if not, write to the Free Software 24 # Foundation, Inc., 5 9 Temple Place - Suite 330,25 # Boston, MA 02111-1307, USA.26 25 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 26 # 02110-1301, USA. 27 # 27 28 # As a special exception to the GNU General Public License, if you 28 29 # distribute this file as part of a program that contains a … … 30 31 # the same distribution terms that you use for the rest of that program. 31 32 33 32 34 # Please send patches to <config-patches@gnu.org>. Submit a context 33 # diff and a properly formatted ChangeLog entry.35 # diff and a properly formatted GNU ChangeLog entry. 34 36 # 35 37 # Configuration subroutine to validate and canonicalize a configuration type. … … 37 39 # If it is invalid, we print an error message on stderr and exit with code 1. 38 40 # Otherwise, we print the canonical config type on stdout and succeed. 41 42 # You can get the latest version of this script from: 43 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD 39 44 40 45 # This file is supposed to be the same for all GNU packages … … 71 76 GNU config.sub ($timestamp) 72 77 73 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 74 Free Software Foundation, Inc. 78 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 79 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free 80 Software Foundation, Inc. 75 81 76 82 This is free software; see the source for copying conditions. There is NO … … 84 90 case $1 in 85 91 --time-stamp | --time* | -t ) 86 echo "$timestamp" ; exit 0;;92 echo "$timestamp" ; exit ;; 87 93 --version | -v ) 88 echo "$version" ; exit 0;;94 echo "$version" ; exit ;; 89 95 --help | --h* | -h ) 90 echo "$usage"; exit 0;;96 echo "$usage"; exit ;; 91 97 -- ) # Stop option processing 92 98 shift; break ;; … … 100 106 # First pass through any local machine types. 101 107 echo $1 102 exit 0;;108 exit ;; 103 109 104 110 * ) … … 119 125 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` 120 126 case $maybe_os in 121 nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ 122 kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) 127 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ 128 linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ 129 knetbsd*-gnu* | netbsd*-gnu* | \ 130 kopensolaris*-gnu* | \ 131 storm-chaos* | os2-emx* | rtmk-nova*) 123 132 os=-$maybe_os 124 133 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` … … 146 155 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ 147 156 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ 148 -apple | -axis | -knuth | -cray )157 -apple | -axis | -knuth | -cray | -microblaze) 149 158 os= 150 159 basic_machine=$1 160 ;; 161 -bluegene*) 162 os=-cnk 151 163 ;; 152 164 -sim | -cisco | -oki | -wec | -winbond) … … 164 176 basic_machine=$1 165 177 ;; 166 167 178 -chorusrdb) 179 os=-chorusrdb 168 180 basic_machine=$1 169 181 ;; 170 182 -hiux*) 171 183 os=-hiuxwe2 184 ;; 185 -sco6) 186 os=-sco5v6 187 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 172 188 ;; 173 189 -sco5) … … 184 200 ;; 185 201 -sco3.2v[4-9]*) 202 # Don't forget version if it is 3.2v4 or newer. 203 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 204 ;; 205 -sco5v6*) 186 206 # Don't forget version if it is 3.2v4 or newer. 187 207 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` … … 231 251 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ 232 252 | am33_2.0 \ 233 | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ 253 | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ 254 | bfin \ 234 255 | c4x | clipper \ 235 256 | d10v | d30v | dlx | dsp16xx \ 236 | f r30 | frv \257 | fido | fr30 | frv \ 237 258 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ 238 259 | i370 | i860 | i960 | ia64 \ 239 260 | ip2k | iq2000 \ 240 | m32r | m32rle | m68000 | m68k | m88k | mcore \ 261 | lm32 \ 262 | m32c | m32r | m32rle | m68000 | m68k | m88k \ 263 | maxq | mb | microblaze | mcore | mep | metag \ 241 264 | mips | mipsbe | mipseb | mipsel | mipsle \ 242 265 | mips16 \ 243 266 | mips64 | mips64el \ 267 | mips64octeon | mips64octeonel \ 268 | mips64orion | mips64orionel \ 269 | mips64r5900 | mips64r5900el \ 244 270 | mips64vr | mips64vrel \ 245 | mips64orion | mips64orionel \246 271 | mips64vr4100 | mips64vr4100el \ 247 272 | mips64vr4300 | mips64vr4300el \ 248 273 | mips64vr5000 | mips64vr5000el \ 274 | mips64vr5900 | mips64vr5900el \ 249 275 | mipsisa32 | mipsisa32el \ 250 276 | mipsisa32r2 | mipsisa32r2el \ … … 255 281 | mipstx39 | mipstx39el \ 256 282 | mn10200 | mn10300 \ 283 | moxie \ 284 | mt \ 257 285 | msp430 \ 286 | nds32 | nds32le | nds32be \ 287 | nios | nios2 \ 258 288 | ns16k | ns32k \ 259 | openrisc | or32 \ 289 | open8 \ 290 | or32 \ 260 291 | pdp10 | pdp11 | pj | pjl \ 261 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe\292 | powerpc | powerpc64 | powerpc64le | powerpcle \ 262 293 | pyramid \ 263 | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ 294 | rx \ 295 | score \ 296 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ 264 297 | sh64 | sh64le \ 265 | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ 266 | strongarm \ 267 | tahoe | thumb | tic4x | tic80 | tron \ 268 | v850 | v850e \ 298 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ 299 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ 300 | spu \ 301 | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ 302 | ubicom32 \ 303 | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ 269 304 | we32k \ 270 | x86 | x scale| xstormy16 | xtensa \271 | z8k )305 | x86 | xc16x | xstormy16 | xtensa \ 306 | z8k | z80) 272 307 basic_machine=$basic_machine-unknown 273 308 ;; 274 m6811 | m68hc11 | m6812 | m68hc12) 309 c54x) 310 basic_machine=tic54x-unknown 311 ;; 312 c55x) 313 basic_machine=tic55x-unknown 314 ;; 315 c6x) 316 basic_machine=tic6x-unknown 317 ;; 318 m6811 | m68hc11 | m6812 | m68hc12 | picochip) 275 319 # Motorola 68HC11/12. 276 320 basic_machine=$basic_machine-unknown … … 278 322 ;; 279 323 m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) 324 ;; 325 ms1) 326 basic_machine=mt-unknown 327 ;; 328 329 strongarm | thumb | xscale) 330 basic_machine=arm-unknown 331 ;; 332 333 xscaleeb) 334 basic_machine=armeb-unknown 335 ;; 336 337 xscaleel) 338 basic_machine=armel-unknown 280 339 ;; 281 340 … … 298 357 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ 299 358 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ 300 | avr-* \301 | b s2000-* \302 | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-*\359 | avr-* | avr32-* \ 360 | bfin-* | bs2000-* \ 361 | c[123]* | c30-* | [cjt]90-* | c4x-* \ 303 362 | clipper-* | craynv-* | cydra-* \ 304 363 | d10v-* | d30v-* | dlx-* \ 305 364 | elxsi-* \ 306 | f30[01]-* | f700-* | f r30-* | frv-* | fx80-* \365 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ 307 366 | h8300-* | h8500-* \ 308 367 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ 309 368 | i*86-* | i860-* | i960-* | ia64-* \ 310 369 | ip2k-* | iq2000-* \ 311 | m32r-* | m32rle-* \ 370 | lm32-* \ 371 | m32c-* | m32r-* | m32rle-* \ 312 372 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ 313 | m88110-* | m88k-* | m core-* \373 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ 314 374 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ 315 375 | mips16-* \ 316 376 | mips64-* | mips64el-* \ 377 | mips64octeon-* | mips64octeonel-* \ 378 | mips64orion-* | mips64orionel-* \ 379 | mips64r5900-* | mips64r5900el-* \ 317 380 | mips64vr-* | mips64vrel-* \ 318 | mips64orion-* | mips64orionel-* \319 381 | mips64vr4100-* | mips64vr4100el-* \ 320 382 | mips64vr4300-* | mips64vr4300el-* \ 321 383 | mips64vr5000-* | mips64vr5000el-* \ 384 | mips64vr5900-* | mips64vr5900el-* \ 322 385 | mipsisa32-* | mipsisa32el-* \ 323 386 | mipsisa32r2-* | mipsisa32r2el-* \ … … 328 391 | mipstx39-* | mipstx39el-* \ 329 392 | mmix-* \ 393 | mt-* \ 330 394 | msp430-* \ 395 | nds32-* | nds32le-* | nds32be-* \ 396 | nios-* | nios2-* \ 331 397 | none-* | np1-* | ns16k-* | ns32k-* \ 398 | open8-* \ 332 399 | orion-* \ 333 400 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ 334 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-*\401 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ 335 402 | pyramid-* \ 336 | romp-* | rs6000-* \337 | sh-* | sh[1234]-* | sh[2 3]e-* | sh[34]eb-* | shbe-* \403 | romp-* | rs6000-* | rx-* \ 404 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ 338 405 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ 339 | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ 340 | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ 341 | tahoe-* | thumb-* \ 406 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ 407 | sparclite-* \ 408 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ 409 | tahoe-* \ 342 410 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ 411 | tile*-* \ 343 412 | tron-* \ 344 | v850-* | v850e-* | vax-* \ 413 | ubicom32-* \ 414 | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ 415 | vax-* \ 345 416 | we32k-* \ 346 | x86-* | x86_64-* | x ps100-* | xscale-* | xstormy16-* \347 | x tensa-* \417 | x86-* | x86_64-* | xc16x-* | xps100-* \ 418 | xstormy16-* | xtensa*-* \ 348 419 | ymp-* \ 349 | z8k-*) 420 | z8k-* | z80-*) 421 ;; 422 # Recognize the basic CPU types without company name, with glob match. 423 xtensa*) 424 basic_machine=$basic_machine-unknown 350 425 ;; 351 426 # Recognize the various machine names and aliases which stand … … 365 440 os=-udi 366 441 ;; 367 442 abacus) 368 443 basic_machine=abacus-unknown 369 444 ;; … … 411 486 os=-bsd 412 487 ;; 488 aros) 489 basic_machine=i386-pc 490 os=-aros 491 ;; 413 492 aux) 414 493 basic_machine=m68k-apple … … 419 498 os=-dynix 420 499 ;; 500 blackfin) 501 basic_machine=bfin-unknown 502 os=-linux 503 ;; 504 blackfin-*) 505 basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` 506 os=-linux 507 ;; 508 bluegene*) 509 basic_machine=powerpc-ibm 510 os=-cnk 511 ;; 512 c54x-*) 513 basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` 514 ;; 515 c55x-*) 516 basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` 517 ;; 518 c6x-*) 519 basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` 520 ;; 421 521 c90) 422 522 basic_machine=c90-cray 423 523 os=-unicos 424 524 ;; 525 cegcc) 526 basic_machine=arm-unknown 527 os=-cegcc 528 ;; 425 529 convex-c1) 426 530 basic_machine=c1-convex … … 451 555 os=-unicosmp 452 556 ;; 453 cr16 c)454 basic_machine=cr16 c-unknown557 cr16 | cr16-*) 558 basic_machine=cr16-unknown 455 559 os=-elf 456 560 ;; … … 489 593 basic_machine=m88k-motorola 490 594 os=-sysv3 595 ;; 596 dicos) 597 basic_machine=i686-pc 598 os=-dicos 599 ;; 600 djgpp) 601 basic_machine=i586-pc 602 os=-msdosdjgpp 491 603 ;; 492 604 dpx20 | dpx20-*) … … 640 752 os=-sysv 641 753 ;; 754 m68knommu) 755 basic_machine=m68k-unknown 756 os=-linux 757 ;; 758 m68knommu-*) 759 basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` 760 os=-linux 761 ;; 642 762 m88k-omron*) 643 763 basic_machine=m88k-omron … … 651 771 os=-sysv 652 772 ;; 773 microblaze) 774 basic_machine=microblaze-xilinx 775 ;; 653 776 mingw32) 654 777 basic_machine=i386-pc 655 778 os=-mingw32 656 779 ;; 780 mingw32ce) 781 basic_machine=arm-unknown 782 os=-mingw32ce 783 ;; 657 784 miniframe) 658 785 basic_machine=m68000-convergent … … 679 806 basic_machine=i386-pc 680 807 os=-msdos 808 ;; 809 ms1-*) 810 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` 681 811 ;; 682 812 mvs) … … 748 878 basic_machine=np1-gould 749 879 ;; 880 neo-tandem) 881 basic_machine=neo-tandem 882 ;; 883 nse-tandem) 884 basic_machine=nse-tandem 885 ;; 750 886 nsr-tandem) 751 887 basic_machine=nsr-tandem … … 755 891 os=-proelf 756 892 ;; 757 o r32 | or32-*)893 openrisc | openrisc-*) 758 894 basic_machine=or32-unknown 759 os=-coff760 895 ;; 761 896 os400) … … 779 914 os=-osf 780 915 ;; 916 parisc) 917 basic_machine=hppa-unknown 918 os=-linux 919 ;; 920 parisc-*) 921 basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` 922 os=-linux 923 ;; 781 924 pbd) 782 925 basic_machine=sparc-tti … … 788 931 basic_machine=ns32k-pc532 789 932 ;; 933 pc98) 934 basic_machine=i386-pc 935 ;; 936 pc98-*) 937 basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` 938 ;; 790 939 pentium | p5 | k5 | k6 | nexgen | viac3) 791 940 basic_machine=i586-pc … … 817 966 power) basic_machine=power-ibm 818 967 ;; 819 ppc) basic_machine=powerpc-unknown 820 ;; 821 ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` 968 ppc | ppcbe) basic_machine=powerpc-unknown 969 ;; 970 ppc-* | ppcbe-*) 971 basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` 822 972 ;; 823 973 ppcle | powerpclittle | ppc-le | powerpc-little) … … 844 994 os=-pw32 845 995 ;; 996 rdos) 997 basic_machine=i386-pc 998 os=-rdos 999 ;; 846 1000 rom68k) 847 1001 basic_machine=m68k-rom68k … … 870 1024 basic_machine=mipsisa64sb1el-unknown 871 1025 ;; 1026 sde) 1027 basic_machine=mipsisa32-sde 1028 os=-elf 1029 ;; 872 1030 sei) 873 1031 basic_machine=mips-sei … … 881 1039 os=-hms 882 1040 ;; 1041 sh5el) 1042 basic_machine=sh5le-unknown 1043 ;; 883 1044 sh64) 884 1045 basic_machine=sh64-unknown … … 902 1063 os=-sysv4 903 1064 ;; 1065 strongarm-* | thumb-*) 1066 basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` 1067 ;; 904 1068 sun2) 905 1069 basic_machine=m68000-sun … … 958 1122 os=-unicos 959 1123 ;; 960 tic54x | c54x*) 961 basic_machine=tic54x-unknown 962 os=-coff 963 ;; 964 tic55x | c55x*) 965 basic_machine=tic55x-unknown 966 os=-coff 967 ;; 968 tic6x | c6x*) 969 basic_machine=tic6x-unknown 970 os=-coff 1124 tile*) 1125 basic_machine=$basic_machine-unknown 1126 os=-linux-gnu 971 1127 ;; 972 1128 tx39) … … 1030 1186 os=-proelf 1031 1187 ;; 1188 xbox) 1189 basic_machine=i686-pc 1190 os=-mingw32 1191 ;; 1032 1192 xps | xps100) 1033 1193 basic_machine=xps100-honeywell 1194 ;; 1195 xscale-* | xscalee[bl]-*) 1196 basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` 1034 1197 ;; 1035 1198 ymp) … … 1039 1202 z8k-*-coff) 1040 1203 basic_machine=z8k-unknown 1204 os=-sim 1205 ;; 1206 z80-*-coff) 1207 basic_machine=z80-unknown 1041 1208 os=-sim 1042 1209 ;; … … 1079 1246 basic_machine=we32k-att 1080 1247 ;; 1081 sh 3 | sh4| sh[34]eb | sh[1234]le | sh[23]ele)1248 sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) 1082 1249 basic_machine=sh-unknown 1083 1250 ;; 1084 sh64) 1085 basic_machine=sh64-unknown 1086 ;; 1087 sparc | sparcv8 | sparcv9 | sparcv9b) 1251 sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) 1088 1252 basic_machine=sparc-sun 1089 1253 ;; … … 1129 1293 then 1130 1294 case $os in 1131 1132 1295 # First match some system type aliases 1296 # that might get confused with valid system types. 1133 1297 # -solaris* is a basic system type, with this one exception. 1298 -auroraux) 1299 os=-auroraux 1300 ;; 1134 1301 -solaris1 | -solaris1.*) 1135 1302 os=`echo $os | sed -e 's|solaris1|sunos4|'` … … 1152 1319 # -sysv* is not here because it comes later, after sysvr4. 1153 1320 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ 1154 | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ 1155 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ 1321 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ 1322 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ 1323 | -sym* | -kopensolaris* \ 1156 1324 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ 1157 | -aos* \1325 | -aos* | -aros* \ 1158 1326 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ 1159 1327 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ 1160 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ 1328 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ 1329 | -openbsd* | -solidbsd* \ 1161 1330 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ 1162 1331 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ 1163 1332 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ 1164 1333 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ 1165 | -chorusos* | -chorusrdb* \1334 | -chorusos* | -chorusrdb* | -cegcc* \ 1166 1335 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ 1167 | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ 1336 | -mingw32* | -linux-gnu* | -linux-android* \ 1337 | -linux-newlib* | -linux-uclibc* \ 1338 | -uxpv* | -beos* | -mpeix* | -udk* \ 1168 1339 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ 1169 1340 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ … … 1171 1342 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ 1172 1343 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ 1173 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) 1344 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ 1345 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) 1174 1346 # Remember, each alternative MUST END IN *, to match a version number. 1175 1347 ;; … … 1189 1361 ;; 1190 1362 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ 1191 | -windows* | -osx | -abug | -netware* | -os9* | -beos* \1363 | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ 1192 1364 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) 1193 1365 ;; … … 1210 1382 os=-openedition 1211 1383 ;; 1212 1384 -os400*) 1213 1385 os=-os400 1214 1386 ;; … … 1259 1431 os=-sysv4 1260 1432 ;; 1261 1433 -tpf*) 1262 1434 os=-tpf 1263 1435 ;; … … 1297 1469 -kaos*) 1298 1470 os=-kaos 1471 ;; 1472 -zvmoe) 1473 os=-zvmoe 1474 ;; 1475 -dicos*) 1476 os=-dicos 1477 ;; 1478 -nacl*) 1299 1479 ;; 1300 1480 -none) … … 1320 1500 1321 1501 case $basic_machine in 1502 score-*) 1503 os=-elf 1504 ;; 1505 spu-*) 1506 os=-elf 1507 ;; 1322 1508 *-acorn) 1323 1509 os=-riscix1.2 … … 1329 1515 os=-aout 1330 1516 ;; 1331 c4x-* | tic4x-*) 1332 os=-coff 1333 ;; 1517 c4x-* | tic4x-*) 1518 os=-coff 1519 ;; 1520 tic54x-*) 1521 os=-coff 1522 ;; 1523 tic55x-*) 1524 os=-coff 1525 ;; 1526 tic6x-*) 1527 os=-coff 1528 ;; 1334 1529 # This must come before the *-dec entry. 1335 1530 pdp10-*) … … 1357 1552 os=-aout 1358 1553 ;; 1554 mep-*) 1555 os=-elf 1556 ;; 1359 1557 mips*-cisco) 1360 1558 os=-elf … … 1375 1573 os=-beos 1376 1574 ;; 1575 *-haiku) 1576 os=-haiku 1577 ;; 1377 1578 *-ibm) 1378 1579 os=-aix 1379 1580 ;; 1380 1581 *-knuth) 1381 1582 os=-mmixware 1382 1583 ;; … … 1483 1684 vendor=sun 1484 1685 ;; 1485 - aix*)1686 -cnk*|-aix*) 1486 1687 vendor=ibm 1487 1688 ;; … … 1546 1747 1547 1748 echo $basic_machine$os 1548 exit 01749 exit 1549 1750 1550 1751 # Local variables: -
pjproject/trunk/third_party/srtp/config_in.h
r1730 r5261 1 1 /* config_in.h. Generated from configure.in by autoheader. */ 2 3 /* Define if building universal (internal helper macro) */ 4 #undef AC_APPLE_UNIVERSAL_BUILD 2 5 3 6 /* Define if building for a CISC machine (e.g. Intel). */ … … 43 46 #undef HAVE_INTTYPES_H 44 47 48 /* Define to 1 if you have the `crypto' library (-lcrypto). */ 49 #undef HAVE_LIBCRYPTO 50 51 /* Define to 1 if you have the `dl' library (-ldl). */ 52 #undef HAVE_LIBDL 53 45 54 /* Define to 1 if you have the `socket' library (-lsocket). */ 46 55 #undef HAVE_LIBSOCKET 47 56 57 /* Define to 1 if you have the `z' library (-lz). */ 58 #undef HAVE_LIBZ 59 48 60 /* Define to 1 if you have the <machine/types.h> header file. */ 49 61 #undef HAVE_MACHINE_TYPES_H … … 55 67 #undef HAVE_NETINET_IN_H 56 68 69 /* Define to 1 if you have the `pcap' library (-lpcap) */ 70 #undef HAVE_PCAP 71 72 /* Define to 1 if you have the `sigaction' function. */ 73 #undef HAVE_SIGACTION 74 57 75 /* Define to 1 if you have the `socket' function. */ 58 76 #undef HAVE_SOCKET … … 115 133 #undef HAVE_X86 116 134 135 /* Define this to use OpenSSL crypto. */ 136 #undef OPENSSL 137 117 138 /* Define to the address where bug reports for this package should be sent. */ 118 139 #undef PACKAGE_BUGREPORT … … 127 148 #undef PACKAGE_TARNAME 128 149 150 /* Define to the home page for this package. */ 151 #undef PACKAGE_URL 152 129 153 /* Define to the version of this package. */ 130 154 #undef PACKAGE_VERSION 131 155 132 /* The size of a`unsigned long', as computed by sizeof. */156 /* The size of `unsigned long', as computed by sizeof. */ 133 157 #undef SIZEOF_UNSIGNED_LONG 134 158 135 /* The size of a`unsigned long long', as computed by sizeof. */159 /* The size of `unsigned long long', as computed by sizeof. */ 136 160 #undef SIZEOF_UNSIGNED_LONG_LONG 137 161 … … 154 178 #undef USE_SYSLOG 155 179 156 /* Define to 1 if your processor stores words with the most significant byte 157 first (like Motorola and SPARC, unlike Intel and VAX). */ 158 #undef WORDS_BIGENDIAN 180 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most 181 significant byte first (like Motorola and SPARC, unlike Intel). */ 182 #if defined AC_APPLE_UNIVERSAL_BUILD 183 # if defined __BIG_ENDIAN__ 184 # define WORDS_BIGENDIAN 1 185 # endif 186 #else 187 # ifndef WORDS_BIGENDIAN 188 # undef WORDS_BIGENDIAN 189 # endif 190 #endif 159 191 160 192 /* Define to empty if `const' does not conform to ANSI C. */ … … 167 199 #endif 168 200 169 /* Define to `unsigned ' if <sys/types.h> does not define. */201 /* Define to `unsigned int' if <sys/types.h> does not define. */ 170 202 #undef size_t -
pjproject/trunk/third_party/srtp/configure
r1730 r5261 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2. 59.3 # Generated by GNU Autoconf 2.69 for libsrtp 1.5.4. 4 4 # 5 # Copyright (C) 2003 Free Software Foundation, Inc. 5 # Report bugs to <https://github.com/cisco/libsrtp/issues>. 6 # 7 # 8 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. 9 # 10 # 6 11 # This configure script is free software; the Free Software Foundation 7 12 # gives unlimited permission to copy, distribute and modify it. 8 ## --------------------- ## 9 ## M4sh Initialization. ## 10 ## --------------------- ## 11 12 # Be Bourne compatible 13 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then 13 ## -------------------- ## 14 ## M4sh Initialization. ## 15 ## -------------------- ## 16 17 # Be more Bourne compatible 18 DUALCASE=1; export DUALCASE # for MKS sh 19 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : 14 20 emulate sh 15 21 NULLCMD=: 16 # Zsh 3.x and 4.x performsword splitting on ${1+"$@"}, which22 # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which 17 23 # is contrary to our usage. Disable this feature. 18 24 alias -g '${1+"$@"}'='"$@"' 19 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then 20 set -o posix 21 fi 22 DUALCASE=1; export DUALCASE # for MKS sh 23 24 # Support unset when possible. 25 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then 26 as_unset=unset 27 else 28 as_unset=false 29 fi 30 31 32 # Work around bugs in pre-3.0 UWIN ksh. 33 $as_unset ENV MAIL MAILPATH 25 setopt NO_GLOB_SUBST 26 else 27 case `(set -o) 2>/dev/null` in #( 28 *posix*) : 29 set -o posix ;; #( 30 *) : 31 ;; 32 esac 33 fi 34 35 36 as_nl=' 37 ' 38 export as_nl 39 # Printing a long string crashes Solaris 7 /usr/bin/printf. 40 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' 41 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo 42 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo 43 # Prefer a ksh shell builtin over an external printf program on Solaris, 44 # but without wasting forks for bash or zsh. 45 if test -z "$BASH_VERSION$ZSH_VERSION" \ 46 && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then 47 as_echo='print -r --' 48 as_echo_n='print -rn --' 49 elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then 50 as_echo='printf %s\n' 51 as_echo_n='printf %s' 52 else 53 if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then 54 as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' 55 as_echo_n='/usr/ucb/echo -n' 56 else 57 as_echo_body='eval expr "X$1" : "X\\(.*\\)"' 58 as_echo_n_body='eval 59 arg=$1; 60 case $arg in #( 61 *"$as_nl"*) 62 expr "X$arg" : "X\\(.*\\)$as_nl"; 63 arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; 64 esac; 65 expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" 66 ' 67 export as_echo_n_body 68 as_echo_n='sh -c $as_echo_n_body as_echo' 69 fi 70 export as_echo_body 71 as_echo='sh -c $as_echo_body as_echo' 72 fi 73 74 # The user is always right. 75 if test "${PATH_SEPARATOR+set}" != set; then 76 PATH_SEPARATOR=: 77 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { 78 (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || 79 PATH_SEPARATOR=';' 80 } 81 fi 82 83 84 # IFS 85 # We need space, tab and new line, in precisely that order. Quoting is 86 # there to prevent editors from complaining about space-tab. 87 # (If _AS_PATH_WALK were called with IFS unset, it would disable word 88 # splitting by setting IFS to empty value.) 89 IFS=" "" $as_nl" 90 91 # Find who we are. Look in the path if we contain no directory separator. 92 as_myself= 93 case $0 in #(( 94 *[\\/]* ) as_myself=$0 ;; 95 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 96 for as_dir in $PATH 97 do 98 IFS=$as_save_IFS 99 test -z "$as_dir" && as_dir=. 100 test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break 101 done 102 IFS=$as_save_IFS 103 104 ;; 105 esac 106 # We did not find ourselves, most probably we were run as `sh COMMAND' 107 # in which case we are not to be found in the path. 108 if test "x$as_myself" = x; then 109 as_myself=$0 110 fi 111 if test ! -f "$as_myself"; then 112 $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 113 exit 1 114 fi 115 116 # Unset variables that we do not need and which cause bugs (e.g. in 117 # pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" 118 # suppresses any "Segmentation fault" message there. '((' could 119 # trigger a bug in pdksh 5.2.14. 120 for as_var in BASH_ENV ENV MAIL MAILPATH 121 do eval test x\${$as_var+set} = xset \ 122 && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : 123 done 34 124 PS1='$ ' 35 125 PS2='> ' … … 37 127 38 128 # NLS nuisances. 39 for as_var in \ 40 LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ 41 LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ 42 LC_TELEPHONE LC_TIME 129 LC_ALL=C 130 export LC_ALL 131 LANGUAGE=C 132 export LANGUAGE 133 134 # CDPATH. 135 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH 136 137 # Use a proper internal environment variable to ensure we don't fall 138 # into an infinite loop, continuously re-executing ourselves. 139 if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then 140 _as_can_reexec=no; export _as_can_reexec; 141 # We cannot yet assume a decent shell, so we have to provide a 142 # neutralization value for shells without unset; and this also 143 # works around shells that cannot unset nonexistent variables. 144 # Preserve -v and -x to the replacement shell. 145 BASH_ENV=/dev/null 146 ENV=/dev/null 147 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 148 case $- in # (((( 149 *v*x* | *x*v* ) as_opts=-vx ;; 150 *v* ) as_opts=-v ;; 151 *x* ) as_opts=-x ;; 152 * ) as_opts= ;; 153 esac 154 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} 155 # Admittedly, this is quite paranoid, since all the known shells bail 156 # out after a failed `exec'. 157 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 158 as_fn_exit 255 159 fi 160 # We don't want this to propagate to other subprocesses. 161 { _as_can_reexec=; unset _as_can_reexec;} 162 if test "x$CONFIG_SHELL" = x; then 163 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : 164 emulate sh 165 NULLCMD=: 166 # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which 167 # is contrary to our usage. Disable this feature. 168 alias -g '\${1+\"\$@\"}'='\"\$@\"' 169 setopt NO_GLOB_SUBST 170 else 171 case \`(set -o) 2>/dev/null\` in #( 172 *posix*) : 173 set -o posix ;; #( 174 *) : 175 ;; 176 esac 177 fi 178 " 179 as_required="as_fn_return () { (exit \$1); } 180 as_fn_success () { as_fn_return 0; } 181 as_fn_failure () { as_fn_return 1; } 182 as_fn_ret_success () { return 0; } 183 as_fn_ret_failure () { return 1; } 184 185 exitcode=0 186 as_fn_success || { exitcode=1; echo as_fn_success failed.; } 187 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } 188 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } 189 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } 190 if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : 191 192 else 193 exitcode=1; echo positional parameters were not saved. 194 fi 195 test x\$exitcode = x0 || exit 1 196 test -x / || exit 1" 197 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO 198 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO 199 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && 200 test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 201 test \$(( 1 + 1 )) = 2 || exit 1" 202 if (eval "$as_required") 2>/dev/null; then : 203 as_have_required=yes 204 else 205 as_have_required=no 206 fi 207 if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : 208 209 else 210 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 211 as_found=false 212 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH 43 213 do 44 if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then 45 eval $as_var=C; export $as_var 214 IFS=$as_save_IFS 215 test -z "$as_dir" && as_dir=. 216 as_found=: 217 case $as_dir in #( 218 /*) 219 for as_base in sh bash ksh sh5; do 220 # Try only shells that exist, to save several forks. 221 as_shell=$as_dir/$as_base 222 if { test -f "$as_shell" || test -f "$as_shell.exe"; } && 223 { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : 224 CONFIG_SHELL=$as_shell as_have_required=yes 225 if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : 226 break 2 227 fi 228 fi 229 done;; 230 esac 231 as_found=false 232 done 233 $as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && 234 { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : 235 CONFIG_SHELL=$SHELL as_have_required=yes 236 fi; } 237 IFS=$as_save_IFS 238 239 240 if test "x$CONFIG_SHELL" != x; then : 241 export CONFIG_SHELL 242 # We cannot yet assume a decent shell, so we have to provide a 243 # neutralization value for shells without unset; and this also 244 # works around shells that cannot unset nonexistent variables. 245 # Preserve -v and -x to the replacement shell. 246 BASH_ENV=/dev/null 247 ENV=/dev/null 248 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 249 case $- in # (((( 250 *v*x* | *x*v* ) as_opts=-vx ;; 251 *v* ) as_opts=-v ;; 252 *x* ) as_opts=-x ;; 253 * ) as_opts= ;; 254 esac 255 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} 256 # Admittedly, this is quite paranoid, since all the known shells bail 257 # out after a failed `exec'. 258 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 259 exit 255 260 fi 261 262 if test x$as_have_required = xno; then : 263 $as_echo "$0: This script requires a shell more modern than all" 264 $as_echo "$0: the shells that I found on your system." 265 if test x${ZSH_VERSION+set} = xset ; then 266 $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" 267 $as_echo "$0: be upgraded to zsh 4.3.4 or later." 46 268 else 47 $as_unset $as_var 269 $as_echo "$0: Please tell bug-autoconf@gnu.org and 270 $0: https://github.com/cisco/libsrtp/issues about your 271 $0: system, including any error possibly output before this 272 $0: message. Then install a modern shell, or manually run 273 $0: the script under such a shell if you do have one." 48 274 fi 49 done 50 51 # Required to use basename. 52 if expr a : '\(a\)' >/dev/null 2>&1; then 275 exit 1 276 fi 277 fi 278 fi 279 SHELL=${CONFIG_SHELL-/bin/sh} 280 export SHELL 281 # Unset more variables known to interfere with behavior of common tools. 282 CLICOLOR_FORCE= GREP_OPTIONS= 283 unset CLICOLOR_FORCE GREP_OPTIONS 284 285 ## --------------------- ## 286 ## M4sh Shell Functions. ## 287 ## --------------------- ## 288 # as_fn_unset VAR 289 # --------------- 290 # Portably unset VAR. 291 as_fn_unset () 292 { 293 { eval $1=; unset $1;} 294 } 295 as_unset=as_fn_unset 296 297 # as_fn_set_status STATUS 298 # ----------------------- 299 # Set $? to STATUS, without forking. 300 as_fn_set_status () 301 { 302 return $1 303 } # as_fn_set_status 304 305 # as_fn_exit STATUS 306 # ----------------- 307 # Exit the shell with STATUS, even in a "trap 0" or "set -e" context. 308 as_fn_exit () 309 { 310 set +e 311 as_fn_set_status $1 312 exit $1 313 } # as_fn_exit 314 315 # as_fn_mkdir_p 316 # ------------- 317 # Create "$as_dir" as a directory, including parents if necessary. 318 as_fn_mkdir_p () 319 { 320 321 case $as_dir in #( 322 -*) as_dir=./$as_dir;; 323 esac 324 test -d "$as_dir" || eval $as_mkdir_p || { 325 as_dirs= 326 while :; do 327 case $as_dir in #( 328 *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( 329 *) as_qdir=$as_dir;; 330 esac 331 as_dirs="'$as_qdir' $as_dirs" 332 as_dir=`$as_dirname -- "$as_dir" || 333 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 334 X"$as_dir" : 'X\(//\)[^/]' \| \ 335 X"$as_dir" : 'X\(//\)$' \| \ 336 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || 337 $as_echo X"$as_dir" | 338 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ 339 s//\1/ 340 q 341 } 342 /^X\(\/\/\)[^/].*/{ 343 s//\1/ 344 q 345 } 346 /^X\(\/\/\)$/{ 347 s//\1/ 348 q 349 } 350 /^X\(\/\).*/{ 351 s//\1/ 352 q 353 } 354 s/.*/./; q'` 355 test -d "$as_dir" && break 356 done 357 test -z "$as_dirs" || eval "mkdir $as_dirs" 358 } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 359 360 361 } # as_fn_mkdir_p 362 363 # as_fn_executable_p FILE 364 # ----------------------- 365 # Test if FILE is an executable regular file. 366 as_fn_executable_p () 367 { 368 test -f "$1" && test -x "$1" 369 } # as_fn_executable_p 370 # as_fn_append VAR VALUE 371 # ---------------------- 372 # Append the text in VALUE to the end of the definition contained in VAR. Take 373 # advantage of any shell optimizations that allow amortized linear growth over 374 # repeated appends, instead of the typical quadratic growth present in naive 375 # implementations. 376 if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : 377 eval 'as_fn_append () 378 { 379 eval $1+=\$2 380 }' 381 else 382 as_fn_append () 383 { 384 eval $1=\$$1\$2 385 } 386 fi # as_fn_append 387 388 # as_fn_arith ARG... 389 # ------------------ 390 # Perform arithmetic evaluation on the ARGs, and store the result in the 391 # global $as_val. Take advantage of shells that can avoid forks. The arguments 392 # must be portable across $(()) and expr. 393 if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : 394 eval 'as_fn_arith () 395 { 396 as_val=$(( $* )) 397 }' 398 else 399 as_fn_arith () 400 { 401 as_val=`expr "$@" || test $? -eq 1` 402 } 403 fi # as_fn_arith 404 405 406 # as_fn_error STATUS ERROR [LINENO LOG_FD] 407 # ---------------------------------------- 408 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 409 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 410 # script with STATUS, using 1 if that was 0. 411 as_fn_error () 412 { 413 as_status=$1; test $as_status -eq 0 && as_status=1 414 if test "$4"; then 415 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 416 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 417 fi 418 $as_echo "$as_me: error: $2" >&2 419 as_fn_exit $as_status 420 } # as_fn_error 421 422 if expr a : '\(a\)' >/dev/null 2>&1 && 423 test "X`expr 00001 : '.*\(...\)'`" = X001; then 53 424 as_expr=expr 54 425 else … … 56 427 fi 57 428 58 if (basename /) >/dev/null 2>&1 && test "X`basename/ 2>&1`" = "X/"; then429 if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then 59 430 as_basename=basename 60 431 else … … 62 433 fi 63 434 64 65 # Name of the executable. 66 as_me=`$as_basename "$0" || 435 if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then 436 as_dirname=dirname 437 else 438 as_dirname=false 439 fi 440 441 as_me=`$as_basename -- "$0" || 67 442 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ 68 443 X"$0" : 'X\(//\)$' \| \ 69 X"$0" : 'X\(/\)$' \| \ 70 . : '\(.\)' 2>/dev/null || 71 echo X/"$0" | 72 sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } 73 /^X\/\(\/\/\)$/{ s//\1/; q; } 74 /^X\/\(\/\).*/{ s//\1/; q; } 75 s/.*/./; q'` 76 77 78 # PATH needs CR, and LINENO needs CR and PATH. 444 X"$0" : 'X\(/\)' \| . 2>/dev/null || 445 $as_echo X/"$0" | 446 sed '/^.*\/\([^/][^/]*\)\/*$/{ 447 s//\1/ 448 q 449 } 450 /^X\/\(\/\/\)$/{ 451 s//\1/ 452 q 453 } 454 /^X\/\(\/\).*/{ 455 s//\1/ 456 q 457 } 458 s/.*/./; q'` 459 79 460 # Avoid depending upon Character Ranges. 80 461 as_cr_letters='abcdefghijklmnopqrstuvwxyz' … … 84 465 as_cr_alnum=$as_cr_Letters$as_cr_digits 85 466 86 # The user is always right. 87 if test "${PATH_SEPARATOR+set}" != set; then 88 echo "#! /bin/sh" >conf$$.sh 89 echo "exit 0" >>conf$$.sh 90 chmod +x conf$$.sh 91 if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then 92 PATH_SEPARATOR=';' 93 else 94 PATH_SEPARATOR=: 95 fi 96 rm -f conf$$.sh 97 fi 98 99 100 as_lineno_1=$LINENO 101 as_lineno_2=$LINENO 102 as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` 103 test "x$as_lineno_1" != "x$as_lineno_2" && 104 test "x$as_lineno_3" = "x$as_lineno_2" || { 105 # Find who we are. Look in the path if we contain no path at all 106 # relative or not. 107 case $0 in 108 *[\\/]* ) as_myself=$0 ;; 109 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 110 for as_dir in $PATH 111 do 112 IFS=$as_save_IFS 113 test -z "$as_dir" && as_dir=. 114 test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break 115 done 116 117 ;; 118 esac 119 # We did not find ourselves, most probably we were run as `sh COMMAND' 120 # in which case we are not to be found in the path. 121 if test "x$as_myself" = x; then 122 as_myself=$0 123 fi 124 if test ! -f "$as_myself"; then 125 { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 126 { (exit 1); exit 1; }; } 127 fi 128 case $CONFIG_SHELL in 129 '') 130 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 131 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH 132 do 133 IFS=$as_save_IFS 134 test -z "$as_dir" && as_dir=. 135 for as_base in sh bash ksh sh5; do 136 case $as_dir in 137 /*) 138 if ("$as_dir/$as_base" -c ' 139 as_lineno_1=$LINENO 140 as_lineno_2=$LINENO 141 as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` 142 test "x$as_lineno_1" != "x$as_lineno_2" && 143 test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then 144 $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } 145 $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } 146 CONFIG_SHELL=$as_dir/$as_base 147 export CONFIG_SHELL 148 exec "$CONFIG_SHELL" "$0" ${1+"$@"} 149 fi;; 150 esac 151 done 152 done 153 ;; 154 esac 155 156 # Create $as_me.lineno as a copy of $as_myself, but with $LINENO 157 # uniformly replaced by the line number. The first 'sed' inserts a 158 # line-number line before each line; the second 'sed' does the real 159 # work. The second script uses 'N' to pair each line-number line 160 # with the numbered line, and appends trailing '-' during 161 # substitution so that $LINENO is not a special case at line end. 162 # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the 163 # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) 164 sed '=' <$as_myself | 467 468 as_lineno_1=$LINENO as_lineno_1a=$LINENO 469 as_lineno_2=$LINENO as_lineno_2a=$LINENO 470 eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && 471 test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { 472 # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) 473 sed -n ' 474 p 475 /[$]LINENO/= 476 ' <$as_myself | 165 477 sed ' 478 s/[$]LINENO.*/&-/ 479 t lineno 480 b 481 :lineno 166 482 N 167 s,$,-, 168 : loop 169 s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, 483 :loop 484 s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ 170 485 t loop 171 s,-$,, 172 s,^['$as_cr_digits']*\n,, 486 s/-\n.*// 173 487 ' >$as_me.lineno && 174 chmod +x $as_me.lineno || 175 { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 176 { (exit 1); exit 1; }; } 177 488 chmod +x "$as_me.lineno" || 489 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } 490 491 # If we had to re-execute with $CONFIG_SHELL, we're ensured to have 492 # already done that, so ensure we don't try to do so again and fall 493 # in an infinite loop. This has already happened in practice. 494 _as_can_reexec=no; export _as_can_reexec 178 495 # Don't try to exec as it changes $[0], causing all sort of problems 179 496 # (the dirname of $[0] is not the place where we might find the 180 # original and so on. Autoconf is especially sensi ble to this).181 . ./$as_me.lineno497 # original and so on. Autoconf is especially sensitive to this). 498 . "./$as_me.lineno" 182 499 # Exit status is that of the last command. 183 500 exit 184 501 } 185 502 186 187 case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in 188 *c*,-n*) ECHO_N= ECHO_C=' 189 ' ECHO_T=' ' ;; 190 *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; 191 *) ECHO_N= ECHO_C='\c' ECHO_T= ;; 503 ECHO_C= ECHO_N= ECHO_T= 504