source:
main/trunk/package-kits/linux/files/gs2build.patch@
32114
Last change on this file since 32114 was 29481, checked in by , 10 years ago | |
---|---|
File size: 3.1 KB |
-
gs2build/build-src/configure.in
old new 88 88 AC_SUBST(ENABLE_JAVA) 89 89 90 90 dnl 91 dnl Set use of wvware (enabled by default)92 dnl93 AC_ARG_ENABLE(wvware, [ --disable-wvware Disable wvWare compilation], USE_WVWARE=$enableval, USE_WVWARE=yes)94 if test $USE_WVWARE = "yes" -o $USE_WVWARE = "1" ; then95 USE_WVWARE=196 AC_DEFINE(USE_WVWARE,[])97 else98 USE_WVWARE=099 fi100 AC_SUBST(USE_WVWARE)101 102 dnl103 91 dnl Set use of JDBM (enabled by default) 104 92 dnl 105 93 AC_ARG_ENABLE(jdbm, [ --disable-jdbm Disable JDBM compilation], USE_JDBM=$enableval, USE_JDBM=yes) … … 472 460 AC_SUBST(MODULEDIRS) 473 461 fi 474 462 475 #----------------------------------------------------------------------------476 # GS3 uses this to set up gnome-lib env, GS2 uses the configure in gs2build/toplevel GS2 installation477 # For gnome-lib-minimal need to source its ./devel.bash before wvware can even be configured478 # For a gnome-lib that's already compiled, don't need to its source ./devel.bash to configure wvware479 # If a gnome-lib is not yet compiled, we compile it first with CASCADE-MAKE.sh480 # Need to make sure that the gnome-lib-minimal is not the cut-down gnome-lib-minimal (which contains481 # only the linux/lib subfolder) that's included with linux and mac binaries, because we can't compile482 # wvware with the cut-down one, only run wvware with it. The test for the cut-down version is that483 # it does not contain devel.bash.484 485 if test $ENABLE_GNOMELIB_EXT = 1; then486 487 if test -z "$GSDLHOME"; then488 cd ..489 gshome=`pwd`490 cd build-src491 else492 gshome=$GSDLHOME493 fi494 495 if test -f $gshome/ext/gnome-lib-minimal/devel.bash; then496 echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..."497 cd $gshome/ext/gnome-lib-minimal498 source ./devel.bash499 cd $gshome/build-src500 elif test -d $gshome/ext/gnome-lib; then501 if test -d $gshome/ext/gnome-lib/$gsdlos; then502 echo "*** Sourcing the gnomelib env for configuring wvware..."503 cd $gshome/ext/gnome-lib504 source ./devel.bash505 cd $gshome/build-src506 fi507 fi508 509 fi510 511 463 # --------------------------------------------------------------------------- 512 AC_CONFIG_SUBDIRS(packages)513 464 514 465 # the list of folders in the src folder 515 466 srclist="src/hashfile/Makefile \ 516 467 src/phind/generate/Makefile \ 517 468 src/java/org/nzdl/gsdl/Makefile" 518 469 519 AC_OUTPUT( packages/MakefileMakefile $srclist $moduleDirs)470 AC_OUTPUT(Makefile $srclist $moduleDirs) 520 471 521 472 -
gs2build/build-src/Makefile.in
old new 48 48 ALLFILES = $(OBJECTS) 49 49 50 50 # all directories should be compiled 51 COMPILEDIRS = packagessrc/hashfile src/phind/generate src/java/org/nzdl/gsdl51 COMPILEDIRS = src/hashfile src/phind/generate src/java/org/nzdl/gsdl 52 52 # a subset of the directories get installed 53 INSTALLDIRS = packagessrc/hashfile src/phind/generate53 INSTALLDIRS = src/hashfile src/phind/generate 54 54 55 55 MODULEDIRS = @MODULEDIRS@ 56 56
Note:
See TracBrowser
for help on using the repository browser.