Changeset 28509

Show
Ignore:
Timestamp:
22.10.2013 16:23:07 (6 years ago)
Author:
ak19
Message:

Bugfix to bug Kathy and I discovered when trying to compile source comp with GS2 binary: GS2 binary has a gnome-lib-minimal folder but it's cut down just to the lib subfolder to help wvware run. The cut down version doesn't help with compiling wvware however, so the test for an existing gnome-lib-minimal has to check for whether it is a cut-down version or the full version.

Location:
main/trunk/greenstone2
Files:
4 modified

Legend:

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

    r28328 r28509  
    19911991_ACEOF 
    19921992 
    1993 elif test -d $gshome/ext/gnome-lib-minimal ; then 
     1993elif test -f $gshome/ext/gnome-lib-minimal/devel.bash ; then 
    19941994   cat >>confdefs.h <<\_ACEOF 
    19951995#define ENABLE_GNOMELIB_EXT $ENABLE_GNOMELIB_EXT 
     
    19971997 
    19981998else 
    1999    echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Disabling gnome-lib-ext" 
     1999   echo "**** WARNING: No gnome-lib or gnome-lib-minimal(/devel.bash) in gs2build/ext folder. Disabling gnome-lib-ext" 
    20002000   cat >>confdefs.h <<\_ACEOF 
    20012001#define ENABLE_GNOMELIB_EXT 0 
     
    84108410# For a gnome-lib that's already compiled, don't need to its source ./devel.bash to configure wvware 
    84118411# If a gnome-lib is not yet compiled, we compile it first with CASCADE-MAKE.sh 
     8412# Need to make sure that the gnome-lib-minimal is not the cut-down gnome-lib-minimal (which contains 
     8413# only the linux/lib subfolder) that's included with linux and mac binaries, because we can't compile  
     8414# wvware with the cut-down one, only run wvware with it. The test for the cut-down version is that  
     8415# it does not contain devel.bash. 
    84128416 
    84138417if test $ENABLE_GNOMELIB_EXT = 1; then 
     
    84218425   fi 
    84228426 
    8423    if test -d $gshome/ext/gnome-lib-minimal; then 
     8427   if test -f $gshome/ext/gnome-lib-minimal/devel.bash; then 
    84248428      echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..." 
    84258429      cd $gshome/ext/gnome-lib-minimal 
  • main/trunk/greenstone2/build-src/configure.in

    r28328 r28509  
    160160if test -d $gshome/ext/gnome-lib ; then 
    161161   AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT) 
    162 elif test -d $gshome/ext/gnome-lib-minimal ; then 
     162elif test -f $gshome/ext/gnome-lib-minimal/devel.bash ; then 
    163163   AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT) 
    164164else 
    165    echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Disabling gnome-lib-ext" 
     165   echo "**** WARNING: No gnome-lib or gnome-lib-minimal(/devel.bash) in gs2build/ext folder. Disabling gnome-lib-ext" 
    166166   AC_DEFINE(ENABLE_GNOMELIB_EXT, 0) 
    167167fi 
     
    478478# For a gnome-lib that's already compiled, don't need to its source ./devel.bash to configure wvware 
    479479# If a gnome-lib is not yet compiled, we compile it first with CASCADE-MAKE.sh 
     480# Need to make sure that the gnome-lib-minimal is not the cut-down gnome-lib-minimal (which contains 
     481# only the linux/lib subfolder) that's included with linux and mac binaries, because we can't compile  
     482# wvware with the cut-down one, only run wvware with it. The test for the cut-down version is that  
     483# it does not contain devel.bash. 
    480484 
    481485if test $ENABLE_GNOMELIB_EXT = 1; then 
     
    489493   fi 
    490494 
    491    if test -d $gshome/ext/gnome-lib-minimal; then 
     495   if test -f $gshome/ext/gnome-lib-minimal/devel.bash; then 
    492496      echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..." 
    493497      cd $gshome/ext/gnome-lib-minimal 
  • main/trunk/greenstone2/configure

    r28327 r28509  
    21072107_ACEOF 
    21082108 
    2109 elif test -d ext/gnome-lib-minimal ; then 
     2109elif test -f ext/gnome-lib-minimal/devel.bash ; then 
    21102110   cat >>confdefs.h <<\_ACEOF 
    21112111#define ENABLE_GNOMELIB_EXT $ENABLE_GNOMELIB_EXT 
     
    21282128 
    21292129      else 
    2130          echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Unable to check out gnome-lib. Disabling gnome-lib-ext." 
     2130         echo "**** WARNING: No gnome-lib or gnome-lib-minimal(/devel.bash) in gs2build/ext folder. Unable to check out gnome-lib. Disabling gnome-lib-ext." 
    21312131     cat >>confdefs.h <<\_ACEOF 
    21322132#define ENABLE_GNOMELIB_EXT 0 
     
    78727872# For a gnome-lib that's already compiled, don't need to its source ./devel.bash to configure wvware 
    78737873# If a gnome-lib is not yet compiled, we compile it first with CASCADE-MAKE.sh 
    7874  
    7875 if test -d ext/gnome-lib-minimal; then 
     7874# Need to make sure that the gnome-lib-minimal is not the cut-down gnome-lib-minimal (which contains 
     7875# only the linux/lib subfolder) that's included with linux and mac binaries, because we can't compile  
     7876# wvware with the cut-down one, only run wvware with it. The test for the cut-down version is that  
     7877# it does not contain devel.bash. 
     7878 
     7879if test -f ext/gnome-lib-minimal/devel.bash; then 
    78767880   echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..." 
    78777881   cd ext/gnome-lib-minimal 
  • main/trunk/greenstone2/configure.in

    r28327 r28509  
    231231if test -d ext/gnome-lib ; then 
    232232   AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT) 
    233 elif test -d ext/gnome-lib-minimal ; then 
     233elif test -f ext/gnome-lib-minimal/devel.bash ; then 
    234234   AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT) 
    235235else 
     
    246246     AC_DEFINE(ENABLE_GNOMELIB_EXT, 1) 
    247247      else 
    248          echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Unable to check out gnome-lib. Disabling gnome-lib-ext." 
     248         echo "**** WARNING: No gnome-lib or gnome-lib-minimal(/devel.bash) in gs2build/ext folder. Unable to check out gnome-lib. Disabling gnome-lib-ext." 
    249249     AC_DEFINE(ENABLE_GNOMELIB_EXT, 0) 
    250250      fi 
     
    555555# For a gnome-lib that's already compiled, don't need to its source ./devel.bash to configure wvware 
    556556# If a gnome-lib is not yet compiled, we compile it first with CASCADE-MAKE.sh 
    557  
    558 if test -d ext/gnome-lib-minimal; then 
     557# Need to make sure that the gnome-lib-minimal is not the cut-down gnome-lib-minimal (which contains 
     558# only the linux/lib subfolder) that's included with linux and mac binaries, because we can't compile  
     559# wvware with the cut-down one, only run wvware with it. The test for the cut-down version is that  
     560# it does not contain devel.bash. 
     561 
     562if test -f ext/gnome-lib-minimal/devel.bash; then 
    559563   echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..." 
    560564   cd ext/gnome-lib-minimal