Ticket #9258: configure.diff

File configure.diff, 2.4 KB (added by Lawrence Rust <lvr@…>, 10 years ago)
  • mythplugins/configure

     
    234234for opt do
    235235  optval="${opt#*=}"
    236236  case "$opt" in
     237  --targetos=*) targetos=`echo $opt | cut -d '=' -f 2`
     238  ;;
    237239  --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
    238240  ;;
    239241  --libdir-name=*) libdir_name=`echo $opt | cut -d '=' -f 2`;
     
    315317        done
    316318    fi
    317319
    318     LIBPATHS="`echo $LIBPATHS $sysroot$prefix/$libdir_name $sysroot/$libdir_name $sysroot/usr/$libdir_name $sysroot/usr/local/$libdir_name $sysroot/usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
     320    LIBPATHS="`echo $LIBPATHS $prefix/$libdir_name $sysroot/$libdir_name $sysroot/usr/$libdir_name $sysroot/usr/local/$libdir_name $sysroot/usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
    319321
    320322    HAS_IT="no"
    321323    for LIBPATH in $LIBPATHS ; do
     
    328330
    329331has_header()
    330332{
    331     HPATHS="$sysroot$prefix/include $sysroot/usr/local/include $sysroot/usr/include $sysroot/usr/include/g++-v3 $sysroot/usr/X11R6/include $sysroot/"
     333    HPATHS="$prefix/include $sysroot/usr/local/include $sysroot/usr/include $sysroot/usr/include/g++-v3 $sysroot/usr/X11R6/include $sysroot/"
    332334    INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
    333335    HPATHS="$HPATHS `echo $INCL | sed s/$libdir_name/include/g` "
    334336
     
    503505        cdaudio="yes"
    504506    fi
    505507
    506     if test "$cdaudio" = "no" -a "$targetos" != "Darwin"; then
     508    if test "$cdaudio" = "no" -a "$targetos" != "Darwin" -a "`echo ${targetos} | cut -c1-5`" != "MINGW"; then
    507509        echo "MythMusic requires libcdaudio."
    508510    fi
    509511
     
    585587###########################################################
    586588
    587589# bring in mythtv config
    588 if [ -e $sysroot$prefix/include/mythtv/mythconfig.mak ] ; then
     590if [ -e $prefix/include/mythtv/mythconfig.mak ] ; then
    589591  rm mythconfig.mak 2> /dev/null
    590   ln -s $sysroot$prefix/include/mythtv/mythconfig.mak mythconfig.mak
     592  ln -s $prefix/include/mythtv/mythconfig.mak mythconfig.mak
    591593else
    592   echo "ERROR: mythconfig.mak not found at $sysroot$prefix/include/mythtv/mythconfig.mak"
     594  echo "ERROR: mythconfig.mak not found at $prefix/include/mythtv/mythconfig.mak"
    593595  echo "Did you make AND install MythTV first?"
    594   echo "Are you using the correct prefix ($prefix) and sysroot ($sysroot)?"
     596  echo "Are you using the correct prefix ($prefix)?"
    595597  echo "Bailing out!!"
    596598  exit
    597599fi