Changeset 28867 for main/trunk

Timestamp:

2014-03-03T22:58:02+13:00 (10 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:

• CASCADE-MAKE.sh (modified) (3 diffs)
• CASCADE-MAKE/CURL.sh (modified) (1 diff)

main/trunk/greenstone2/runtime-src/packages/security/CASCADE-MAKE.sh

@@ -32 +32 @@
 # svn checkout https://owasp-esapi-cplusplus.googlecode.com/svn/trunk/ owasp-esapi-cpp
 
-pkglist="$CRYPTOPP $ZLIB $BZIP2 $CURL $CMAKE $BOOST $SAFEINT $OWASPCPP"
+pkglist="$SAFEINT $CRYPTOPP $ZLIB $BZIP2 $CURL $CMAKE $BOOST $OWASPCPP"
 
 
@@ -77 +77 @@
 
 # http://stackoverflow.com/questions/546817/iterating-over-two-lists-in-parallel-in-bin-s
-makearray=("CRYPTOPP" "ZLIB" "BZIP2" "CURL" "CMAKE" "BOOST" "SAFEINT" "OWASPCPP")
+makearray=("SAFEINT" "CRYPTOPP" "ZLIB" "BZIP2" "CURL" "CMAKE" "BOOST" "OWASPCPP")
 pkgarray=($pkglist)
 
@@ -83 +83 @@
 for i in `seq 1 $count`
 do
-    echo "Compiling ${pkgarray[$i-1]} by running ${makearray[$i-1]}.sh"
     makefile=${makearray[$i-1]}
     export compiledir=${pkgarray[$i-1]}
 
     if [ -e CASCADE-MAKE/$makefile.sh ]; then
+    echo "Compiling $compiledir by running makefile.sh"
     ./CASCADE-MAKE/$makefile.sh $*
     fi

main/trunk/greenstone2/runtime-src/packages/security/CASCADE-MAKE/CURL.sh

@@ -19 +19 @@
 
 # configure, but only if we haven't already
-if [ ! -e config.h ] ; then
+if [ ! -e config.log ] ; then
     ./configure --prefix=$prefix
 fi