Changeset 27092

Timestamp:

2013-03-18T19:34:57+13:00 (10 years ago)

Author:

ak19

Message:

Putting the config file back. Sourcing devel.bash from configure.in is still a problem.

File:

• main/trunk/greenstone2/build-src/packages/configure (modified) (1 diff)

main/trunk/greenstone2/build-src/packages/configure

@@ -144 +144 @@
 echo ""
 
-if test x$USE_WVWARE = xtrue ; then
-
-  gnomelibmin="${prefix}/ext/gnome-lib-minimal"
-  gnomelibsrc="${prefix}/ext/gnome-lib"
-  gnomelibcompiled="${prefix}/ext/gnome-lib/$GSDLOS"
-# the gnome-lib folder (minimal or src) from which we'll run
-# source devel.bash before we can configure (and eventually compile) wvware:
-  gnomelibdir=""
-
-# a gnome-lib-minimal folder is a binary gnome-lib, so doesn't 
-# need to be compiled up
-  if test -d "$gnomelibmin" ; then
-    gnomelibdir=$gnomelibmin
-
-  else 
-      if test -d "$gnomelibsrc" ; then
-      gnomelibdir=$gnomelibsrc
-
-      if test ! -d "$gnomelibcompiled" ; then
-# there is a gnome-lib source folder but it's not yet compiled up, 
-# so compile it first before we can configure let alone compile wvware
-          echo "*** Going to compile gnome-lib source code in $gnomelibsrc"
-          cd "$gnomelibsrc" && chmod a+rx devel.bash && ./CASCADE-MAKE.sh
-      fi
-      fi
-  fi
-
+# datadir flag is for default location of wvHtml.xml config file
+if test x$USE_WVWARE = xtrue ; 
+then
   cd "$PACKAGES/wv"
   gzip -dc wv-1.2.4-gs.tar.gz | tar -xf -  
-
-# datadir flag is for default location of wvHtml.xml config file
-  if test -z "$gnomelibdir" ; then
-      cd "wv-gs" && \
-      ./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --libdir="$libdir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS
-
-  else
-      echo "**** Compiling wvware with the help of gnome-lib in $gnomelibdir"
-
-      /bin/bash -c "cd \"$gnomelibdir\" source devel.bash && cd \"$PACKAGES/wv/wv-gs\" ./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir=\"$bindir\" --libdir=\"$libdir\" --datadir=\"$prefix/etc/packages\" $HOSTTARGETFLAGS"
-  fi
-
+  cd wv-gs && \
+  ./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --libdir="$libdir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS
 else
   echo "wvWare support disabled."