Changeset 14681

Show
Ignore:
Timestamp:
06/10/08 09:18:28 (6 months ago)
Author:
dron
Message:

Added logic to detect JPEG2000 library in MrSID DSDK 7.x.
See http://trac.osgeo.org/gdal/ticket/2410 for details

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.5/gdal/configure.in

    r14667 r14681  
    13021302    fi 
    13031303 
    1304     if test "x$with_jp2mrsid" = "x" -a "$HAVE_KAKADU" = "no" \ 
    1305             -a -r $with_mrsid/3rd-party/lib/Release/libltikdu.a ; then  
    1306       with_jp2mrsid=yes 
     1304    MRSID_KAKADU_LIB=no 
     1305    if test "$HAVE_KAKADU" = "no" ; then 
     1306      if test x"$with_jp2mrsid" = x"" -o x"$with_jp2mrsid" = x"yes" ; then 
     1307        if test -r $with_mrsid/3rd-party/lib/Release/libltikdu.a ; then  
     1308          with_jp2mrsid=yes 
     1309          MRSID_KAKADU_LIB=-lltikdu 
     1310        elif test -r $with_mrsid/3rd-party/lib/Release/liblt_kakadu.a ; then  
     1311          with_jp2mrsid=yes 
     1312          MRSID_KAKADU_LIB=-llt_kakadu 
     1313        else 
     1314          AC_MSG_ERROR([MrSID JPEG2000 support requested, but libltikdu.a not found.]) 
     1315        fi 
     1316      fi 
    13071317    fi 
    1308     if test "x$with_jp2mrsid" = "xyes" \ 
    1309             -a ! -r $with_mrsid/3rd-party/lib/Release/libltikdu.a ; then  
    1310       AC_MSG_ERROR([MrSID JPEG2000 support requested, but libltikdu.a not found.]) 
    1311     fi 
    13121318 
    13131319    if test "x$with_jp2mrsid" = "xyes" ; then 
    1314       MRSID_LIBS="$MRSID_LIBS -lltikdu" 
     1320      MRSID_LIBS="$MRSID_LIBS $MRSID_KAKADU_LIB" 
    13151321      MRSID_FLAGS="-DMRSID_J2K $MRSID_FLAGS" 
    13161322      AC_MSG_RESULT([enabled])