Changeset 28310

Timestamp:

2013-09-25T21:23:42+12:00 (11 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:

• configure (modified) (1 diff)
• configure.in (modified) (1 diff)

main/trunk/gs2build/configure

@@ -8447 +8447 @@
 fi
 
+#----------------------------------------------------------------------------
+# GS2 uses this configure to set up gnome-lib env, GS3 uses the one in gs2build/build-src
+# 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
+
+if test -d ext/gnome-lib-minimal; then
+   echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..."
+   cd ext/gnome-lib-minimal
+   source ./devel.bash
+   cd ../..
+elif test -d ext/gnome-lib; then
+  if  -d ext/gnome-lib/$gsdlos ; then
+    echo "*** gnome-lib already compiled up in ext/gnome-lib/$gsdlos"
+    echo "*** Sourcing the gnomelib env for configuring wvware for GS2 (although it's not necessary)..."
+    cd ext/gnome-lib
+    source ./devel.bash
+    cd ../..
+  else
+    echo "*** Compiling up gnome-lib..."
+    cd ext/gnome-lib
+    ./CASCADE-MAKE.sh
+    gnomestatus=$?
+    if  $gnomestatus != 0  ; then
+       echo "****************************************"
+       echo "@@@ Failed to compile up gnomelib successfully"
+       echo "****************************************"
+       exit -1
+    fi
+    cd ../..
+  fi
+fi
 
 # ---------------------------------------------------------------------------

main/trunk/gs2build/configure.in

@@ -425 +425 @@
 fi
 
+#----------------------------------------------------------------------------
+# GS2 uses this configure to set up gnome-lib env, GS3 uses the one in gs2build/build-src
+# 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
+
+if test -d ext/gnome-lib-minimal; then
+   echo "*** gnome-lib (minimal) detected. Sourcing the gnomelib env for configuring wvware..."
+   cd ext/gnome-lib-minimal
+   source ./devel.bash
+   cd ../..
+elif test -d ext/gnome-lib; then
+  if [ -d ext/gnome-lib/$gsdlos ]; then
+    echo "*** gnome-lib already compiled up in ext/gnome-lib/$gsdlos"
+    echo "*** Sourcing the gnomelib env for configuring wvware for GS2 (although it's not necessary)..."
+    cd ext/gnome-lib
+    source ./devel.bash
+    cd ../..
+  else
+    echo "*** Compiling up gnome-lib..."
+    cd ext/gnome-lib
+    ./CASCADE-MAKE.sh
+    gnomestatus=$?
+    if [ $gnomestatus != 0 ] ; then
+       echo "****************************************"
+       echo "@@@ Failed to compile up gnomelib successfully"
+       echo "****************************************"
+       exit -1
+    fi
+    cd ../..
+  fi 
+fi
 
 # ---------------------------------------------------------------------------