source: main/trunk/package-kits/linux/gs2build.patch@ 29460

gs2build/build-src/configure.in

@@ -88 +88 @@
 AC_SUBST(ENABLE_JAVA)
 
 dnl
-dnl Set use of wvware (enabled by default)
-dnl
-AC_ARG_ENABLE(wvware, [  --disable-wvware          Disable wvWare compilation], USE_WVWARE=$enableval, USE_WVWARE=yes)
-if test $USE_WVWARE = "yes" -o $USE_WVWARE = "1" ; then
-  USE_WVWARE=1
-  AC_DEFINE(USE_WVWARE,[])
-else
-  USE_WVWARE=0
-fi
-AC_SUBST(USE_WVWARE)
-
-dnl
 dnl Set use of JDBM (enabled by default)
 dnl
 AC_ARG_ENABLE(jdbm, [  --disable-jdbm          Disable JDBM compilation], USE_JDBM=$enableval, USE_JDBM=yes)
@@ -472 +460 @@
   AC_SUBST(MODULEDIRS)
 fi
 
-#----------------------------------------------------------------------------
-# GS3 uses this to set up gnome-lib env, GS2 uses the configure in gs2build/toplevel GS2 installation
-# For gnome-lib-minimal need to source its ./devel.bash before wvware can even be configured
-# For a gnome-lib that's already compiled, don't need to its source ./devel.bash to configure wvware
-# If a gnome-lib is not yet compiled, we compile it first with CASCADE-MAKE.sh
-# Need to make sure that the gnome-lib-minimal is not the cut-down gnome-lib-minimal (which contains
-# only the linux/lib subfolder) that's included with linux and mac binaries, because we can't compile 
-# wvware with the cut-down one, only run wvware with it. The test for the cut-down version is that 
-# it does not contain devel.bash.
-
-if test $ENABLE_GNOMELIB_EXT = 1; then
-
-   if test -z "$GSDLHOME"; then
-      cd ..
-      gshome=`pwd`
-      cd build-src
-   else 
-      gshome=$GSDLHOME  
-   fi
-
-   if test -f $gshome/ext/gnome-lib-minimal/devel.bash; then
-      echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..."
-      cd $gshome/ext/gnome-lib-minimal
-      source ./devel.bash
-      cd $gshome/build-src
-   elif test -d $gshome/ext/gnome-lib; then
-     if test -d $gshome/ext/gnome-lib/$gsdlos; then
-        echo "*** Sourcing the gnomelib env for configuring wvware..."
-    cd $gshome/ext/gnome-lib
-        source ./devel.bash
-        cd $gshome/build-src    
-     fi 
-   fi
-
-fi
-
 # ---------------------------------------------------------------------------
-AC_CONFIG_SUBDIRS(packages)
 
 # the list of folders in the src folder
 srclist="src/hashfile/Makefile \
          src/phind/generate/Makefile \
          src/java/org/nzdl/gsdl/Makefile"
 
-AC_OUTPUT(packages/Makefile Makefile $srclist $moduleDirs)
+AC_OUTPUT(Makefile $srclist $moduleDirs)
 
 

gs2build/build-src/Makefile.in

@@ -48 +48 @@
 ALLFILES = $(OBJECTS)
 
 # all directories should be compiled
-COMPILEDIRS = packages src/hashfile src/phind/generate src/java/org/nzdl/gsdl
+COMPILEDIRS = src/hashfile src/phind/generate src/java/org/nzdl/gsdl
 # a subset of the directories get installed
-INSTALLDIRS = packages src/hashfile src/phind/generate 
+INSTALLDIRS = src/hashfile src/phind/generate 
 
 MODULEDIRS = @MODULEDIRS@