Changeset 28308 for main/trunk/greenstone2/build-src/configure.in

Timestamp:

2013-09-25T19:49:10+12:00 (11 years ago)

Author:

ak19

Message:

Configuration and make stages now work with gnome-lib. Committing GS2 configure.in, build-src's configure.in and Makefile.in. Will commit the two configure files for these from the ubuntu since the autoconf is of a higher version there. Also need to commit the gs2build configure.in and configure still.

File:

• main/trunk/greenstone2/build-src/configure.in (modified) (2 diffs)

main/trunk/greenstone2/build-src/configure.in

@@ -147 +147 @@
 fi
 AC_SUBST(USE_SQLITE)
+
+dnl
+dnl Set compilation and/or sourcing of gnome-lib extension (disabled by default)
+dnl
+AC_ARG_ENABLE(gnome-lib-ext, [  --enable-gnome-lib-ext  Enable the gnome-lib extension], ENABLE_GNOMELIB_EXT=1, ENABLE_GNOMELIB_EXT=0)
+
+if test -z "$GSDLHOME"; then
+  gshome=..
+else 
+  gshome=$GSDLHOME
+fi
+if test -d $gshome/ext/gnome-lib ; then
+   AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT)
+elif test -d $gshome/ext/gnome-lib-minimal ; then
+   AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT)
+else
+   echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Disabling gnome-lib-ext"
+   AC_DEFINE(ENABLE_GNOMELIB_EXT, 0)
+fi
+AC_SUBST(ENABLE_GNOMELIB_EXT)
 
 dnl Checks for programs.
@@ -453 +473 @@
 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
+
+if test $ENABLE_GNOMELIB_EXT = 1; then
+
+   if test -z "$GSDLHOME"; then
+      cd ..
+      gshome=`pwd`
+      cd build-src
+   else 
+      gshome=$GSDLHOME  
+   fi
+
+   if test -d $gshome/ext/gnome-lib-minimal; 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 [ -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
 
 # ---------------------------------------------------------------------------