Changeset 28308
- Timestamp:
- 2013-09-25T19:49:10+12:00 (10 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/build-src/Makefile.in
r20873 r28308 54 54 MODULEDIRS = @MODULEDIRS@ 55 55 56 ENABLE_GNOMELIB_EXT=@ENABLE_GNOMELIB_EXT@ 57 56 58 57 59 all: 60 if test $(ENABLE_GNOMELIB_EXT) = 1; then \ 61 if test -d ../ext/gnome-lib; then \ 62 pushd ../ext/gnome-lib && source ./devel.bash && popd; \ 63 elif test -d ../ext/gnome-lib-minimal; then \ 64 pushd ../ext/gnome-lib-minimal && source ./devel.bash && popd; \ 65 fi; \ 66 fi 58 67 for odir in $(COMPILEDIRS) $(MODULEDIRS); do \ 59 68 echo making $@ in $$odir; \ -
main/trunk/greenstone2/build-src/configure.in
r26809 r28308 147 147 fi 148 148 AC_SUBST(USE_SQLITE) 149 150 dnl 151 dnl Set compilation and/or sourcing of gnome-lib extension (disabled by default) 152 dnl 153 AC_ARG_ENABLE(gnome-lib-ext, [ --enable-gnome-lib-ext Enable the gnome-lib extension], ENABLE_GNOMELIB_EXT=1, ENABLE_GNOMELIB_EXT=0) 154 155 if test -z "$GSDLHOME"; then 156 gshome=.. 157 else 158 gshome=$GSDLHOME 159 fi 160 if test -d $gshome/ext/gnome-lib ; then 161 AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT) 162 elif test -d $gshome/ext/gnome-lib-minimal ; then 163 AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT) 164 else 165 echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Disabling gnome-lib-ext" 166 AC_DEFINE(ENABLE_GNOMELIB_EXT, 0) 167 fi 168 AC_SUBST(ENABLE_GNOMELIB_EXT) 149 169 150 170 dnl Checks for programs. … … 453 473 fi 454 474 475 #---------------------------------------------------------------------------- 476 # GS3 uses this to set up gnome-lib env, GS2 uses the configure in gs2build/toplevel GS2 installation 477 # For gnome-lib-minimal need to source its ./devel.bash before wvware can even be configured 478 # For a gnome-lib that's already compiled, don't need to its source ./devel.bash to configure wvware 479 # If a gnome-lib is not yet compiled, we compile it first with CASCADE-MAKE.sh 480 481 if test $ENABLE_GNOMELIB_EXT = 1; then 482 483 if test -z "$GSDLHOME"; then 484 cd .. 485 gshome=`pwd` 486 cd build-src 487 else 488 gshome=$GSDLHOME 489 fi 490 491 if test -d $gshome/ext/gnome-lib-minimal; then 492 echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..." 493 cd $gshome/ext/gnome-lib-minimal 494 source ./devel.bash 495 cd $gshome/build-src 496 elif test -d $gshome/ext/gnome-lib; then 497 if [ -d $gshome/ext/gnome-lib/$gsdlos ]; then 498 echo "*** Sourcing the gnomelib env for configuring wvware..." 499 cd $gshome/ext/gnome-lib 500 source ./devel.bash 501 cd $gshome/build-src 502 fi 503 fi 504 505 fi 455 506 456 507 # --------------------------------------------------------------------------- -
main/trunk/greenstone2/configure.in
r25149 r28308 521 521 522 522 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 529 if 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 ../.. 534 elif 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 554 fi 555 523 556 # --------------------------------------------------------------------------- 524 557 dnl for Darwin, as our packages don't (yet) correctly guess our system type.
Note:
See TracChangeset
for help on using the changeset viewer.