Changeset 28310


Ignore:
Timestamp:
09/25/13 21:23:42 (8 years ago)
Author:
ak19
Message:

Committing the currently unused gs2build/configure files (unused by GS3 as well as by GS2), to incorporate the recent changes made to greenstone2/configure. Related commits are 28308 and 28309, the first already changed build-src's configure files and Makefile.in to get gnome-lib compiled for GS3 and the greenstone2 toplevel configure files to get gnome-lib compilation to work for GS2. The commit message was: Configuration and make stages now work with gnome-lib.

Location:
main/trunk/gs2build
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/gs2build/configure

    r25215 r28310  
    84478447fi
    84488448
     8449#----------------------------------------------------------------------------
     8450# GS2 uses this configure to set up gnome-lib env, GS3 uses the one in gs2build/build-src
     8451# For gnome-lib-minimal need to source its ./devel.bash before wvware can even be configured
     8452# For a gnome-lib that's already compiled, don't need to its source ./devel.bash to configure wvware
     8453# If a gnome-lib is not yet compiled, we compile it first with CASCADE-MAKE.sh
     8454
     8455if test -d ext/gnome-lib-minimal; then
     8456   echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..."
     8457   cd ext/gnome-lib-minimal
     8458   source ./devel.bash
     8459   cd ../..
     8460elif test -d ext/gnome-lib; then
     8461  if  -d ext/gnome-lib/$gsdlos ; then
     8462    echo "*** gnome-lib already compiled up in ext/gnome-lib/$gsdlos"
     8463    echo "*** Sourcing the gnomelib env for configuring wvware for GS2 (although it's not necessary)..."
     8464    cd ext/gnome-lib
     8465    source ./devel.bash
     8466    cd ../..
     8467  else
     8468    echo "*** Compiling up gnome-lib..."
     8469    cd ext/gnome-lib
     8470    ./CASCADE-MAKE.sh
     8471    gnomestatus=$?
     8472    if  $gnomestatus != 0  ; then
     8473       echo "****************************************"
     8474       echo "@@@ Failed to compile up gnomelib successfully"
     8475       echo "****************************************"
     8476       exit -1
     8477    fi
     8478    cd ../..
     8479  fi
     8480fi
    84498481
    84508482# ---------------------------------------------------------------------------
  • main/trunk/gs2build/configure.in

    r25215 r28310  
    425425fi
    426426
     427#----------------------------------------------------------------------------
     428# GS2 uses this configure to set up gnome-lib env, GS3 uses the one in gs2build/build-src
     429# For gnome-lib-minimal need to source its ./devel.bash before wvware can even be configured
     430# For a gnome-lib that's already compiled, don't need to its source ./devel.bash to configure wvware
     431# If a gnome-lib is not yet compiled, we compile it first with CASCADE-MAKE.sh
     432
     433if test -d ext/gnome-lib-minimal; then
     434   echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..."
     435   cd ext/gnome-lib-minimal
     436   source ./devel.bash
     437   cd ../..
     438elif test -d ext/gnome-lib; then
     439  if [ -d ext/gnome-lib/$gsdlos ]; then
     440    echo "*** gnome-lib already compiled up in ext/gnome-lib/$gsdlos"
     441    echo "*** Sourcing the gnomelib env for configuring wvware for GS2 (although it's not necessary)..."
     442    cd ext/gnome-lib
     443    source ./devel.bash
     444    cd ../..
     445  else
     446    echo "*** Compiling up gnome-lib..."
     447    cd ext/gnome-lib
     448    ./CASCADE-MAKE.sh
     449    gnomestatus=$?
     450    if [ $gnomestatus != 0 ] ; then
     451       echo "****************************************"
     452       echo "@@@ Failed to compile up gnomelib successfully"
     453       echo "****************************************"
     454       exit -1
     455    fi
     456    cd ../..
     457  fi
     458fi
    427459
    428460# ---------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.