Changeset 28867

Show
Ignore:
Timestamp:
03.03.2014 22:58:02 (6 years ago)
Author:
ak19
Message:

Fix to test for when configure in curl does not need to be re-run.

Location:
main/trunk/greenstone2/runtime-src/packages/security
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/packages/security/CASCADE-MAKE.sh

    r28866 r28867  
    3232# svn checkout https://owasp-esapi-cplusplus.googlecode.com/svn/trunk/ owasp-esapi-cpp 
    3333 
    34 pkglist="$CRYPTOPP $ZLIB $BZIP2 $CURL $CMAKE $BOOST $SAFEINT $OWASPCPP" 
     34pkglist="$SAFEINT $CRYPTOPP $ZLIB $BZIP2 $CURL $CMAKE $BOOST $OWASPCPP" 
    3535 
    3636 
     
    7777 
    7878# http://stackoverflow.com/questions/546817/iterating-over-two-lists-in-parallel-in-bin-s 
    79 makearray=("CRYPTOPP" "ZLIB" "BZIP2" "CURL" "CMAKE" "BOOST" "SAFEINT" "OWASPCPP") 
     79makearray=("SAFEINT" "CRYPTOPP" "ZLIB" "BZIP2" "CURL" "CMAKE" "BOOST" "OWASPCPP") 
    8080pkgarray=($pkglist) 
    8181 
     
    8383for i in `seq 1 $count` 
    8484do 
    85     echo "Compiling ${pkgarray[$i-1]} by running ${makearray[$i-1]}.sh" 
    8685    makefile=${makearray[$i-1]} 
    8786    export compiledir=${pkgarray[$i-1]} 
    8887 
    8988    if [ -e CASCADE-MAKE/$makefile.sh ]; then 
     89    echo "Compiling $compiledir by running makefile.sh" 
    9090    ./CASCADE-MAKE/$makefile.sh $* 
    9191    fi 
  • main/trunk/greenstone2/runtime-src/packages/security/CASCADE-MAKE/CURL.sh

    r28866 r28867  
    1919 
    2020# configure, but only if we haven't already 
    21 if [ ! -e config.h ] ; then 
     21if [ ! -e config.log ] ; then 
    2222    ./configure --prefix=$prefix 
    2323fi