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/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