Ticket #1198: fix_libdir64.diff

File fix_libdir64.diff, 2.1 KB (added by mythtv@…, 15 years ago)

Fix typo in mythtv/configure and add code to mythplugins to detect installed libs/headers of dependancies correctly

  • mythtv/configure

     
    608608  ;; 
    609609  --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`; force_prefix=yes
    610610  ;;
    611   --libdir-name=*) prefix=`echo $opt | cut -d '=' -f 2`;
     611  --libdir-name=*) libdir_name=`echo $opt | cut -d '=' -f 2`;
    612612  ;;
    613613  --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`; force_prefix=yes
    614614  ;;
  • mythplugins/configure

     
    88#
    99
    1010prefix="/usr/local"
     11libdir_name="lib"
    1112
    1213music="yes"
    1314video="yes"
     
    4950NB:      all --enable-* options can be reversed with --disable-*
    5051
    5152Generic options:
    52   --prefix=PREFIX          MythTV install location PREFIX [$prefix]"
     53  --prefix=PREFIX          MythTV install location PREFIX [$prefix]
     54  --libdir-name=LIBNAME    install libs in PREFIX/LIBNAME [$libdir_name]
    5355  --help                   print this message
    5456  --enable-all             Enable all options
    5557  --enable-opengl          enable OpenGL (Music and Gallery) [$opengl]
     
    125127  case "$opt" in
    126128  --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
    127129  ;;
     130  --libdir-name=*) libdir_name=`echo $opt | cut -d '=' -f 2`;
     131  ;;
    128132  --enable-mythmusic) music="yes"
    129133  ;;
    130134  --disable-mythmusic) music="no"
     
    271275        done
    272276    fi
    273277
    274     LIBPATHS="`echo $LIBPATHS $prefix/lib /lib /usr/lib /usr/local/lib /usr/X11R6/lib | sed s/'\/ '/' '/g` "
     278    LIBPATHS="`echo $LIBPATHS $prefix/$libdir_name /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
    275279
    276280    HAS_IT="no"
    277281    for LIBPATH in $LIBPATHS ; do
     
    286290{
    287291    HPATHS="$prefix/include /usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include /"
    288292    INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
    289     HPATHS="$HPATHS `echo $INCL | sed s/lib/include/g` "
     293    HPATHS="$HPATHS `echo $INCL | sed s,$libdir_name,include,g` "
    290294
    291295    HAS_IT="no"
    292296    for HPATH in $HPATHS ; do