Changeset 14670

Show
Ignore:
Timestamp:
06/09/08 10:19:26 (6 months ago)
Author:
warmerdam
Message:

regenerated

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.5/gdal/configure

    r14493 r14670  
    2315923159 
    2316023160MRSID_FLAGS= 
     23161HAVE_MRSID=no 
    2316123162 
    2316223163 
    …… 
    2318323184else 
    2318423185 
    23185   { echo "$as_me:$LINENO: checking for lt_base.h in $with_mrsid/include/support" >&5 
    23186 echo $ECHO_N "checking for lt_base.h in $with_mrsid/include/support... $ECHO_C" >&6; } 
    23187   if test -r "$with_mrsid/include/support/lt_base.h" ; then 
     23186  MRSID_BASE="$with_mrsid/include" 
     23187 
     23188  { echo "$as_me:$LINENO: checking for lt_base.h in $MRSID_BASE/support" >&5 
     23189echo $ECHO_N "checking for lt_base.h in $MRSID_BASE/support... $ECHO_C" >&6; } 
     23190  if test -r "$MRSID_BASE/support/lt_base.h" ; then 
     23191 
    2318823192    { echo "$as_me:$LINENO: result: found MrSID DSDK version 4.x or newer." >&5 
    2318923193echo "${ECHO_T}found MrSID DSDK version 4.x or newer." >&6; } 
    23190  
    2319123194    HAVE_MRSID=yes 
    23192     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" 
     23195    MRSID_INCLUDE="-I$MRSID_BASE/base -I$MRSID_BASE/metadata -I$MRSID_BASE/mrsid_readers -I$MRSID_BASE/j2k_readers -I$MRSID_BASE/support" 
     23196 
     23197  else 
     23198 
     23199    { echo "$as_me:$LINENO: result: not found." >&5 
     23200echo "${ECHO_T}not found." >&6; } 
     23201 
     23202    { echo "$as_me:$LINENO: checking for lt_base.h in $MRSID_BASE" >&5 
     23203echo $ECHO_N "checking for lt_base.h in $MRSID_BASE... $ECHO_C" >&6; } 
     23204    if test -r "$MRSID_BASE/lt_base.h" ; then 
     23205 
     23206      { echo "$as_me:$LINENO: result: found MrSID DSDK version 7.x or newer." >&5 
     23207echo "${ECHO_T}found MrSID DSDK version 7.x or newer." >&6; }; 
     23208      HAVE_MRSID=yes 
     23209      MRSID_INCLUDE="-I$MRSID_BASE" 
     23210 
     23211    fi 
     23212 
     23213  fi 
     23214 
     23215  if test $HAVE_MRSID = yes ; then 
     23216 
    2319323217    MRSID_LIBS="-lltidsdk -lpthread" 
    2319423218 
    …… 
    2384823872        LDFLAGS="$LDFLAGS $expat_lib_flags" 
    2384923873 
     23874        saved_LIBS="$LIBS" 
     23875        LIBS="$LIBS -lexpat" 
     23876 
    2385023877                                { echo "$as_me:$LINENO: checking for Expat XML Parser headers in $expat_include_dir" >&5 
    2385123878echo $ECHO_N "checking for Expat XML Parser headers in $expat_include_dir... $ECHO_C" >&6; } 
    …… 
    2400124028        CPPFLAGS="$saved_CPPFLAGS" 
    2400224029        LDFLAGS="$saved_LDFLAGS" 
     24030        LIBS="$saved_LIBS" 
    2400324031    fi 
    2400424032