Changeset 28509 for main/trunk/greenstone2/build-src

Timestamp:

2013-10-22T16:23:07+13:00 (11 years ago)

Author:

ak19

Message:

Bugfix to bug Kathy and I discovered when trying to compile source comp with GS2 binary: GS2 binary has a gnome-lib-minimal folder but it's cut down just to the lib subfolder to help wvware run. The cut down version doesn't help with compiling wvware however, so the test for an existing gnome-lib-minimal has to check for whether it is a cut-down version or the full version.

Location:

main/trunk/greenstone2/build-src

Files:

• configure (modified) (4 diffs)
• configure.in (modified) (3 diffs)

main/trunk/greenstone2/build-src/configure

@@ -1991 +1991 @@
 _ACEOF
 
-elif test -d $gshome/ext/gnome-lib-minimal ; then
+elif test -f $gshome/ext/gnome-lib-minimal/devel.bash ; then
    cat >>confdefs.h <<\_ACEOF
 #define ENABLE_GNOMELIB_EXT $ENABLE_GNOMELIB_EXT
@@ -1997 +1997 @@
 
 else
-   echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Disabling gnome-lib-ext"
+   echo "**** WARNING: No gnome-lib or gnome-lib-minimal(/devel.bash) in gs2build/ext folder. Disabling gnome-lib-ext"
    cat >>confdefs.h <<\_ACEOF
 #define ENABLE_GNOMELIB_EXT 0
@@ -8410 +8410 @@
 # 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
@@ -8421 +8425 @@
    fi
 
-   if test -d $gshome/ext/gnome-lib-minimal; then
+   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

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

@@ -160 +160 @@
 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
+elif test -f $gshome/ext/gnome-lib-minimal/devel.bash ; 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"
+   echo "**** WARNING: No gnome-lib or gnome-lib-minimal(/devel.bash) in gs2build/ext folder. Disabling gnome-lib-ext"
    AC_DEFINE(ENABLE_GNOMELIB_EXT, 0)
 fi
@@ -478 +478 @@
 # 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
@@ -489 +493 @@
    fi
 
-   if test -d $gshome/ext/gnome-lib-minimal; then
+   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