Changeset 14759

Show
Ignore:
Timestamp:
06/24/08 15:54:02 (5 months ago)
Author:
warmerdam
Message:

regenerated

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gdal/configure

    r14492 r14759  
    2317423174 
    2317523175MRSID_FLAGS= 
     23176HAVE_MRSID=no 
    2317623177 
    2317723178 
    …… 
    2319823199else 
    2319923200 
    23200   { echo "$as_me:$LINENO: checking for lt_base.h in $with_mrsid/include/support" >&5 
    23201 echo $ECHO_N "checking for lt_base.h in $with_mrsid/include/support... $ECHO_C" >&6; } 
    23202   if test -r "$with_mrsid/include/support/lt_base.h" ; then 
     23201  MRSID_BASE="$with_mrsid/include" 
     23202 
     23203  { echo "$as_me:$LINENO: checking for lt_base.h in $MRSID_BASE/support" >&5 
     23204echo $ECHO_N "checking for lt_base.h in $MRSID_BASE/support... $ECHO_C" >&6; } 
     23205  if test -r "$MRSID_BASE/support/lt_base.h" ; then 
     23206 
    2320323207    { echo "$as_me:$LINENO: result: found MrSID DSDK version 4.x or newer." >&5 
    2320423208echo "${ECHO_T}found MrSID DSDK version 4.x or newer." >&6; } 
    23205  
    2320623209    HAVE_MRSID=yes 
    23207     MRSID_INCLUDE="-I$with_mrsid/include/base -I$with_mrsid/include/metadata -I$with_mrsid/include/mrsid_readers -I$with_mrsid/include/j2k_readers -I$with_mrsid/include/support" 
     23210    MRSID_INCLUDE="-I$MRSID_BASE/base -I$MRSID_BASE/metadata -I$MRSID_BASE/mrsid_readers -I$MRSID_BASE/j2k_readers -I$MRSID_BASE/support" 
     23211 
     23212  else 
     23213 
     23214    { echo "$as_me:$LINENO: result: not found." >&5 
     23215echo "${ECHO_T}not found." >&6; } 
     23216 
     23217    { echo "$as_me:$LINENO: checking for lt_base.h in $MRSID_BASE" >&5 
     23218echo $ECHO_N "checking for lt_base.h in $MRSID_BASE... $ECHO_C" >&6; } 
     23219    if test -r "$MRSID_BASE/lt_base.h" ; then 
     23220 
     23221      { echo "$as_me:$LINENO: result: found MrSID DSDK version 7.x or newer." >&5 
     23222echo "${ECHO_T}found MrSID DSDK version 7.x or newer." >&6; }; 
     23223      HAVE_MRSID=yes 
     23224      MRSID_INCLUDE="-I$MRSID_BASE" 
     23225 
     23226    fi 
     23227 
     23228  fi 
     23229 
     23230  if test $HAVE_MRSID = yes ; then 
     23231 
    2320823232    MRSID_LIBS="-lltidsdk -lpthread" 
    2320923233 
    …… 
    2323323257    fi 
    2323423258 
    23235     if test "x$with_jp2mrsid" = "x" -a "$HAVE_KAKADU" = "no" \ 
    23236             -a -r $with_mrsid/3rd-party/lib/Release/libltikdu.a ; then 
    23237       with_jp2mrsid=yes 
    23238     fi 
    23239     if test "x$with_jp2mrsid" = "xyes" \ 
    23240             -a ! -r $with_mrsid/3rd-party/lib/Release/libltikdu.a ; then 
    23241       { { echo "$as_me:$LINENO: error: MrSID JPEG2000 support requested, but libltikdu.a not found." >&5 
     23259    MRSID_KAKADU_LIB=no 
     23260    if test "$HAVE_KAKADU" = "no" ; then 
     23261      if test x"$with_jp2mrsid" = x"" -o x"$with_jp2mrsid" = x"yes" ; then 
     23262        if test -r $with_mrsid/3rd-party/lib/Release/libltikdu.a ; then 
     23263          with_jp2mrsid=yes 
     23264          MRSID_KAKADU_LIB=-lltikdu 
     23265        elif test -r $with_mrsid/3rd-party/lib/Release/liblt_kakadu.a ; then 
     23266          with_jp2mrsid=yes 
     23267          MRSID_KAKADU_LIB=-llt_kakadu 
     23268        else 
     23269          { { echo "$as_me:$LINENO: error: MrSID JPEG2000 support requested, but libltikdu.a not found." >&5 
    2324223270echo "$as_me: error: MrSID JPEG2000 support requested, but libltikdu.a not found." >&2;} 
    2324323271   { (exit 1); exit 1; }; } 
     23272        fi 
     23273      fi 
    2324423274    fi 
    2324523275 
    2324623276    if test "x$with_jp2mrsid" = "xyes" ; then 
    23247       MRSID_LIBS="$MRSID_LIBS -lltikdu" 
     23277      MRSID_LIBS="$MRSID_LIBS $MRSID_KAKADU_LIB" 
    2324823278      MRSID_FLAGS="-DMRSID_J2K $MRSID_FLAGS" 
    2324923279      { echo "$as_me:$LINENO: result: enabled" >&5