Ignore:
Timestamp:
2013-09-25T19:49:10+12:00 (11 years ago)
Author:
ak19
Message:

Configuration and make stages now work with gnome-lib. Committing GS2 configure.in, build-src's configure.in and Makefile.in. Will commit the two configure files for these from the ubuntu since the autoconf is of a higher version there. Also need to commit the gs2build configure.in and configure still.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/configure.in

    r25149 r28308  
    521521
    522522
     523#----------------------------------------------------------------------------
     524# GS2 uses this configure to set up gnome-lib env, GS3 uses the one in gs2build/build-src
     525# For gnome-lib-minimal need to source its ./devel.bash before wvware can even be configured
     526# For a gnome-lib that's already compiled, don't need to its source ./devel.bash to configure wvware
     527# If a gnome-lib is not yet compiled, we compile it first with CASCADE-MAKE.sh
     528
     529if test -d ext/gnome-lib-minimal; then
     530   echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..."
     531   cd ext/gnome-lib-minimal
     532   source ./devel.bash
     533   cd ../..
     534elif test -d ext/gnome-lib; then
     535  if [ -d ext/gnome-lib/$gsdlos ]; then
     536    echo "*** gnome-lib already compiled up in ext/gnome-lib/$gsdlos"
     537    echo "*** Sourcing the gnomelib env for configuring wvware for GS2 (although it's not necessary)..."
     538    cd ext/gnome-lib
     539    source ./devel.bash
     540    cd ../..
     541  else
     542    echo "*** Compiling up gnome-lib..."
     543    cd ext/gnome-lib
     544    ./CASCADE-MAKE.sh
     545    gnomestatus=$?
     546    if [ $gnomestatus != 0 ] ; then
     547       echo "****************************************"
     548       echo "@@@ Failed to compile up gnomelib successfully"
     549       echo "****************************************"
     550       exit -1
     551    fi
     552    cd ../..
     553  fi
     554fi
     555
    523556# ---------------------------------------------------------------------------
    524557dnl for Darwin, as our packages don't (yet) correctly guess our system type.
Note: See TracChangeset for help on using the changeset viewer.