Changeset 23720

Show
Ignore:
Timestamp:
17.02.2011 11:43:33 (9 years ago)
Author:
sjm84
Message:

Hopefully fixed issues with iconv on Mac

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/packages/configure

    r23714 r23720  
    195195    fi 
    196196    cd "$PACKAGES/iconv/libiconv-1.13.1" 
     197 
     198    if test -e Makefile ; then   
     199    echo make distclean && \ 
     200        make distclean 
     201    fi 
     202 
     203    # configure 
     204    echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 
     205    CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 
    197206else 
    198207    if test ! -d libiconv-1.11 ; then 
     
    200209    fi 
    201210    cd "$PACKAGES/iconv/libiconv-1.11" 
    202 fi 
    203  
    204 if test -e Makefile ; then   
    205     echo make distclean && \ 
    206     make distclean 
    207 fi 
    208  
    209 # configure 
    210     echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 
    211 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 
     211 
     212    if test -e Makefile ; then   
     213    echo make distclean && \ 
     214        make distclean 
     215    fi 
     216 
     217    # configure 
     218    echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 
     219    CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT 
     220fi 
    212221 
    213222# make