comparison acinclude.m4 @ 466:75819e5c59d4

Build system fixes.
author Ryan C. Gordon <icculus@icculus.org>
date Wed, 15 Oct 2003 02:21:31 +0000
parents 6d94441c854e
children 0b244f36049e
comparison
equal deleted inserted replaced
465:636796aed4e2 466:75819e5c59d4
578 exit(1); 578 exit(1);
579 } 579 }
580 580
581 if (($smpeg_major_version > major) || 581 if (($smpeg_major_version > major) ||
582 (($smpeg_major_version == major) && ($smpeg_minor_version > minor)) || 582 (($smpeg_major_version == major) && ($smpeg_minor_version > minor)) ||
583 (($smpeg_major_version == major) && ($smpeg_minor_version == minor) 583 (($smpeg_major_version == major) && ($smpeg_minor_version == minor) &&
584 && ($smpeg_micro_version >= micro))) 584 ($smpeg_micro_version >= micro)))
585 { 585 {
586 return 0; 586 return 0;
587 } 587 }
588 else 588 else
589 { 589 {
590 printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the 590 printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the minimum version\n", $smpeg_major_version, $smpeg_minor_version, $smpeg_micro_version);
591 minimum version\n", $smpeg_major_version, $smpeg_minor_version, 591 printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is correct, then it is\n", major, minor, micro);
592 $smpeg_micro_version);
593 printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is
594 correct, then it is\n", major, minor, micro);
595 printf("*** best to upgrade to the required version.\n"); 592 printf("*** best to upgrade to the required version.\n");
596 printf("*** If smpeg-config was wrong, set the environment variable 593 printf("*** If smpeg-config was wrong, set the environment variable SMPEG_CONFIG\n");
597 SMPEG_CONFIG\n"); 594 printf("*** to point to the correct copy of smpeg-config, and remove the file\n");
598 printf("*** to point to the correct copy of smpeg-config, and remove
599 the file\n");
600 printf("*** config.cache before re-running configure\n"); 595 printf("*** config.cache before re-running configure\n");
601 return 1; 596 return 1;
602 } 597 }
603 } 598 }
604 599
611 AC_MSG_RESULT(yes) 606 AC_MSG_RESULT(yes)
612 ifelse([$2], , :, [$2]) 607 ifelse([$2], , :, [$2])
613 else 608 else
614 AC_MSG_RESULT(no) 609 AC_MSG_RESULT(no)
615 if test "$SMPEG_CONFIG" = "no" ; then 610 if test "$SMPEG_CONFIG" = "no" ; then
616 echo "*** The smpeg-config script installed by SMPEG could not be 611 echo "*** The smpeg-config script installed by SMPEG could not be found"
617 found" 612 echo "*** If SMPEG was installed in PREFIX, make sure PREFIX/bin is in"
618 echo "*** If SMPEG was installed in PREFIX, make sure PREFIX/bin is 613 echo "*** your path, or set the SMPEG_CONFIG environment variable to the"
619 in"
620 echo "*** your path, or set the SMPEG_CONFIG environment variable to
621 the"
622 echo "*** full path to smpeg-config." 614 echo "*** full path to smpeg-config."
623 else 615 else
624 if test -f conf.smpegtest ; then 616 if test -f conf.smpegtest ; then
625 : 617 :
626 else 618 else
629 LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS" 621 LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS"
630 AC_TRY_LINK([ 622 AC_TRY_LINK([
631 #include <stdio.h> 623 #include <stdio.h>
632 #include "smpeg.h" 624 #include "smpeg.h"
633 ], [ return 0; ], 625 ], [ return 0; ],
634 [ echo "*** The test program compiled, but did not run. This 626 [ echo "*** The test program compiled, but did not run. This usually means"
635 usually means" 627 echo "*** that the run-time linker is not finding SMPEG or finding the wrong"
636 echo "*** that the run-time linker is not finding SMPEG or 628 echo "*** version of SMPEG. If it is not finding SMPEG, you'll need to set your"
637 finding the wrong" 629 echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
638 echo "*** version of SMPEG. If it is not finding SMPEG, you'll 630 echo "*** to the installed location Also, make sure you have run ldconfig if that"
639 need to set your"
640 echo "*** LD_LIBRARY_PATH environment variable, or edit
641 /etc/ld.so.conf to point"
642 echo "*** to the installed location Also, make sure you have run
643 ldconfig if that"
644 echo "*** is required on your system" 631 echo "*** is required on your system"
645 echo "***" 632 echo "***"
646 echo "*** If you have an old version installed, it is best to 633 echo "*** If you have an old version installed, it is best to remove it, although"
647 remove it, although" 634 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
648 echo "*** you may also be able to get things to work by modifying 635 [ echo "*** The test program failed to compile or link. See the file config.log for the"
649 LD_LIBRARY_PATH"], 636 echo "*** exact error that occured. This usually means SMPEG was incorrectly installed"
650 [ echo "*** The test program failed to compile or link. See the 637 echo "*** or that you have moved SMPEG since it was installed. In the latter case, you"
651 file config.log for the" 638 echo "*** may want to edit the smpeg-config script: $SMPEG_CONFIG" ])
652 echo "*** exact error that occured. This usually means SMPEG was
653 incorrectly installed"
654 echo "*** or that you have moved SMPEG since it was installed. In
655 the latter case, you"
656 echo "*** may want to edit the smpeg-config script:
657 $SMPEG_CONFIG" ])
658 CFLAGS="$ac_save_CFLAGS" 639 CFLAGS="$ac_save_CFLAGS"
659 LIBS="$ac_save_LIBS" 640 LIBS="$ac_save_LIBS"
660 fi 641 fi
661 fi 642 fi
662 SMPEG_CFLAGS="" 643 SMPEG_CFLAGS=""