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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • 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