Changeset 26054

Show
Ignore:
Timestamp:
01.08.2012 10:48:09 (7 years ago)
Author:
sjm84
Message:

Configuration will now fail if one of the build-src packages fails to configure

Files:
1 modified

Legend:

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

    r25151 r26054  
    153153fi 
    154154 
     155if test x$? = x1 ; 
     156then 
     157  echo "Configuration of wvWare failed." 
     158  exit 1 
     159fi 
     160 
    155161# configure the pdftohtml converter 
    156162echo "" 
     
    163169./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT 
    164170 
     171if test x$? = x1 ; 
     172then 
     173  echo "Configuration of pdftohtml failed." 
     174  exit 1 
     175fi 
     176 
    165177# rtftohtml converter 
    166178echo "" 
     
    173185./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS 
    174186 
    175  
     187if test x$? = x1 ; 
     188then 
     189  echo "Configuration of rtftohtml failed." 
     190  exit 1 
     191fi 
    176192 
    177193# configure wget 
     
    184200#./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS  
    185201./configure $CACHE_FILE --prefix=$PACKAGES/wget --without-ssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS  
     202 
     203if test x$? = x1 ; 
     204then 
     205  echo "Configuration of wget failed." 
     206  exit 1 
     207fi 
    186208 
    187209# configure XML::Parser perl module 
     
    206228  EXPATLIBPATH="$GSDLHOME/common-src/packages/expat/lib"  
    207229 
     230if test x$? = x1 ; 
     231then 
     232  echo "Configuration of XML-Parser failed." 
     233  exit 1 
     234fi 
    208235 
    209236# configure powerpoint converter 
     
    216243./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS 
    217244 
     245if test x$? = x1 ; 
     246then 
     247  echo "Configuration of xlhtml failed." 
     248  exit 1 
     249fi 
    218250 
    219251# configure IsisGdl program 
     
    223255cd "$PACKAGES/isis-gdl" && \ 
    224256./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT 
     257 
     258if test x$? = x1 ; 
     259then 
     260  echo "Configuration of IsisGdl failed." 
     261  exit 1 
     262fi 
    225263 
    226264# configure HTMLTidy program 
     
    233271./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT 
    234272 
     273if test x$? = x1 ; 
     274then 
     275  echo "Configuration of HTMLTidy failed." 
     276  exit 1 
     277fi